Changeset 31576

Timestamp:

02/27/2015 07:37:47 PM (10 years ago)

Author:

wonderboymusic

Message:

In the ->multi_resize() method of the WP_Image_Editor subclasses, when looping through potential crops, we need to make sure the crop isn't the exact same dimensions as the original image before copying it as a new crop.

This ensures that we don't save multiple copies of the same image.

Supposedly broke in [30639], but this logic was always missing. When I tested reverting [30639], there were still 2 files being created.

Fixes #31296.

Location:

trunk/src/wp-includes

Files:

• class-wp-image-editor-gd.php (modified) (1 diff)
• class-wp-image-editor-imagick.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -232 +232 @@
 
             $image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-
-            if( ! is_wp_error( $image ) ) {
+            $duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+
+            if ( ! is_wp_error( $image ) && ! $duplicate ) {
                 $resized = $this->_save( $image );
 

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -302 +302 @@
 
             $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-
-            if( ! is_wp_error( $resize_result ) ) {
+            $duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+
+            if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
                 $resized = $this->_save( $this->image );