Merge pull request blueimp#3483 from jbostoen/patch-1

blueimp · web-flow · commit a7ddbeb368de · 2017-07-21T14:52:40.000+02:00
Update UploadHandler.php
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
@@ -871,7 +871,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
         if (!empty($options['max_height'])) {
             $new_height = $max_height = $options['max_height'];
         }
-        if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) {
+        if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || !empty($options['strip']) )) {
             if ($file_path !== $new_file_path) {
                 return copy($file_path, $new_file_path);
             }

Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {`
`871`	`871`	`if (!empty($options['max_height'])) {`
`872`	`872`	`$new_height = $max_height = $options['max_height'];`
`873`	`873`	`}`
`874`		`- if (!($image_oriented \|\| $max_width < $img_width \|\| $max_height < $img_height)) {`
	`874`	`+ if (!($image_oriented \|\| $max_width < $img_width \|\| $max_height < $img_height \|\| !empty($options['strip']) )) {`
`875`	`875`	`if ($file_path !== $new_file_path) {`
`876`	`876`	`return copy($file_path, $new_file_path);`
`877`	`877`	`}`