Ticket #22308: 22308-better-test.diff

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

@@ -34 +34 @@
          * @return boolean
          */
         public static function test( $args = null ) {
-                if ( ! extension_loaded( 'imagick' ) )
+                if ( ! extension_loaded( 'imagick' ) || ! is_callable( 'Imagick', 'queryFormats' ) )
                         return false;
 
                 return true;
@@ -150 +150 @@
                 $imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
                 try {
-                        return ( (bool) $this->image->queryFormats( $imagick_extension ) );
+                        return ( (bool) Imagick::queryFormats( $imagick_extension ) );
                 }
                 catch ( Exception $e ) {
                         return false;