WordPress 3.7.2-scripts

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor-imagick.php

diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index f803943a4bcaf217c1be444311498766f0cfdbda..2e1bebc994afcee056a2301c2d63aad7176d9e33 100644 (file)
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -242,17 +242,21 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
        }
 
        /**
-        * Processes current image and saves to disk
-        * multiple sizes from single source.
-        *
-        * 'width' and 'height' are required.
-        * 'crop' defaults to false when not provided.
+        * Resize multiple images from a single source.
         *
         * @since 3.5.0
         * @access public
         *
-        * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
-        * @return array
+        * @param array $sizes {
+        *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
+        *
+        *     @type array $size {
+        *         @type int  $width  Image width.
+        *         @type int  $height Image height.
+        *         @type bool $crop   Optional. Whether to crop the image. Default false.
+        *     }
+        * }
+        * @return array An array of resized images metadata by size.
         */
        public function multi_resize( $sizes ) {
                $metadata = array();
@@ -352,11 +356,18 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                 */
                try {
                        $this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+
+                       // Since this changes the dimensions of the image, update the size.
+                       $result = $this->update_size();
+                       if ( is_wp_error( $result ) )
+                               return $result;
+
+                       $this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
                }
                catch ( Exception $e ) {
                        return new WP_Error( 'image_rotate_error', $e->getMessage() );
                }
-               return $this->update_size();
+               return true;
        }
 
        /**