Changeset 24055

Timestamp:

04/22/2013 08:28:05 PM (11 years ago)

Author:

nacin

Message:

Image editors: multi_resize() should require height and width. Crop is now optional and defaults to false. props DH-Shredder. fixes #23884.

Location:

trunk/wp-includes

Files:

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

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

@@ -179 +179 @@
      * multiple sizes from single source.
      *
-     * @since 3.5.0
-     * @access public
-     *
-     * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+     * '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]}, ... }
      * @return array
      */
@@ -190 +193 @@
 
         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'] );
 

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

@@ -246 +246 @@
      * multiple sizes from single source.
      *
-     * @since 3.5.0
-     * @access public
-     *
-     * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+     * '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]}, ... }
      * @return array
      */
@@ -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'] );

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

@@ -98 +98 @@
      * multiple sizes from single source.
      *
-     * @since 3.5.0
-     * @access public
-     * @abstract
-     *
-     * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
+     * '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]}, ... }
      * @return array
      */