Changeset 22864

Timestamp:

11/27/2012 02:52:24 PM (14 years ago)

Author:

ryan

Message:

Clean up WP_Image_Editor_Imagick::test(). Props DH-Shredder. see #22543

File:

• trunk/wp-includes/class-wp-image-editor-imagick.php (modified) (4 diffs)

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

@@ -39 +39 @@
          */
         public static function test( $args = array() ) {
+
+                // First, test Imagick's extension and classes.
+                if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
+                        return false;
 
                 $required_methods = array(
@@ -60 +64 @@
                 );
 
-                // Check for requirements
-                if ( ! extension_loaded( 'imagick' ) ||
-                         ! class_exists( 'Imagick' ) ||
-                         ! is_callable( 'Imagick', 'queryFormats' ) ||
-                         ! class_exists( 'ImagickPixel' ) ||
+                // Now, test for deep requirements within Imagick.
+                if ( ! is_callable( 'Imagick', 'queryFormats' ) ||
                          ! defined( 'imagick::COMPRESSION_JPEG' ) ||
                          array_diff( $required_methods, get_class_methods( 'Imagick' ) ) ) {
@@ -71 +72 @@
                 }
 
-                /**
-                 * setIteratorIndex is optional unless mime is an animated format.
-                 * Here, we just say no if a user is attempting to
-                 * edit a GIF and setIteratorIndex isn't available.
-                 */
-                if ( ( ! isset( $args['mime_type'] ) || $args['mime_type'] == 'image/gif' ) &&
-                         ! method_exists( 'Imagick', 'setIteratorIndex' ) ) {
-
-                        return false;
-                }
-
                 return true;
         }
@@ -99 +89 @@
                 if ( ! $imagick_extension )
                         return false;
+
+                // setIteratorIndex is optional unless mime is an animated format.
+                // Here, we just say no if you are missing it and aren't loading a jpeg.
+                if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+                                return false;
 
                 try {