WordPress 4.4

[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 bcfb576433d0b3426bed2a102aa3a90acf52e647..a14fa406578f0dae6716ce1c244fd1e6975262ec 100644 (file)
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -48,7 +48,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
        public static function test( $args = array() ) {
 
                // First, test Imagick's extension and classes.
        public static function test( $args = array() ) {
 
                // First, test Imagick's extension and classes.

-               if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
+               if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )

                        return false;
 
                if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
                        return false;
 
                if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )


@@ -208,7 +208,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                                $size = $this->image->getImageGeometry();
                        }
                        catch ( Exception $e ) {
                                $size = $this->image->getImageGeometry();
                        }
                        catch ( Exception $e ) {

-                               return new WP_Error( 'invalid_image', __('Could not read image size'), $this->file );
+                               return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );

                        }
                }
 
                        }
                }
 


@@ -270,15 +270,17 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
         * @access public
         *
         * @param array $sizes {
         * @access public
         *
         * @param array $sizes {

-        *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
+        *     An array of image size arrays. Default sizes are 'small', 'medium', 'medium_large', 'large'.

         *
         *     Either a height or width must be provided.
         *     If one of the two is set to null, the resize will
         *     maintain aspect ratio according to the provided dimension.
         *
         *     @type array $size {
         *
         *     Either a height or width must be provided.
         *     If one of the two is set to null, the resize will
         *     maintain aspect ratio according to the provided dimension.
         *
         *     @type array $size {

-        *         @type int  ['width']  Optional. Image width.
-        *         @type int  ['height'] Optional. Image height.
+        *         Array of height, width values, and whether to crop.
+        *
+        *         @type int  $width  Image width. Optional if `$height` is specified.
+        *         @type int  $height Image height. Optional if `$width` is specified.

         *         @type bool $crop   Optional. Whether to crop the image. Default false.
         *     }
         * }
         *         @type bool $crop   Optional. Whether to crop the image. Default false.
         *     }
         * }