Changeset 22904

Timestamp:

11/28/2012 09:41:44 PM (11 years ago)

Author:

nacin

Message:

Explicitly check for version 2.2.0 or higher of the Imagick PHP module, to ensure we can call queryFormats() statically. props DH-Shredder, fixes #22308.

File:

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

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

@@ -30 +30 @@
      * Checks to see if current environment supports Imagick.
      *
-     * We require Imagick 2.1.1 or greater, based on whether the queryFormats()
+     * We require Imagick 2.2.0 or greater, based on whether the queryFormats()
      * method can be called statically.
      *
@@ -42 +42 @@
         // First, test Imagick's extension and classes.
         if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
+            return false;
+
+        if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
             return false;
 
@@ -65 +68 @@
 
         // Now, test for deep requirements within Imagick.
-        if ( ! is_callable( 'Imagick', 'queryFormats' ) ||
-             ! defined( 'imagick::COMPRESSION_JPEG' ) ||
-             array_diff( $required_methods, get_class_methods( 'Imagick' ) ) ) {
-
-            return false;
-        }
+        if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+            return false;
+
+        if ( array_diff( $required_methods, get_class_methods( 'Imagick' ) ) )
+            return false;
 
         return true;