Ticket #23884: 23884.diff

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

@@ -173 +173 @@
          * Processes current image and saves to disk
          * multiple sizes from single source.
          *
+         * 'width' and 'height' are required.
+         * 'crop' defaults to false when not provided.
+         *
          * @since 3.5.0
          * @access public
          *
-         * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+         * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
          * @return array
          */
         public function multi_resize( $sizes ) {
@@ -184 +187 @@
                 $orig_size = $this->size;
 
                 foreach ( $sizes as $size => $size_data ) {
+                        if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+                                continue;
+
+                        if ( ! isset( $size_data['crop'] ) )
+                                $size_data['crop'] = false;
+
                         $image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 
                         if( ! is_wp_error( $image ) ) {

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

@@ -245 +245 @@
          * Processes current image and saves to disk
          * multiple sizes from single source.
          *
+         * 'width' and 'height' are required.
+         * 'crop' defaults to false when not provided.
+         *
          * @since 3.5.0
          * @access public
          *
-         * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+         * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
          * @return array
          */
         public function multi_resize( $sizes ) {
@@ -260 +263 @@
                         if ( ! $this->image )
                                 $this->image = $orig_image->getImage();
 
+                        if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+                                continue;
+
+                        if ( ! isset( $size_data['crop'] ) )
+                                $size_data['crop'] = false;
+
                         $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 
                         if( ! is_wp_error( $resize_result ) ) {

wp-includes/class-wp-image-editor.php

@@ -97 +97 @@
          * Processes current image and saves to disk
          * multiple sizes from single source.
          *
+         * 'width' and 'height' are required.
+         * 'crop' defaults to false when not provided.
+         *
          * @since 3.5.0
          * @access public
          * @abstract
          *
-         * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+         * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
          * @return array
          */
         abstract public function multi_resize( $sizes );