Ticket #22597: 22597.diff

wp-admin/includes/image-edit.php

@@ -40 +40 @@
                 <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
 
         // On some setups GD library does not provide imagerotate() - Ticket #11536
-        if ( function_exists('imagerotate') ) { ?>
+        if ( wp_image_editor_supports( array( 'methods', array( 'rotate' ) ) ) ) { ?>
                 <div class="imgedit-rleft"  onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
                 <div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
 <?php } else {
-                $note_gdlib = esc_attr__('Image rotation is not supported by your web host (function imagerotate() is missing)');
+                $note_no_rotate = esc_attr__('Image rotation is not supported by your web host.');
 ?>
-            <div class="imgedit-rleft disabled"  title="<?php echo $note_gdlib; ?>"></div>
-            <div class="imgedit-rright disabled" title="<?php echo $note_gdlib; ?>"></div>
+            <div class="imgedit-rleft disabled"  title="<?php echo $note_no_rotate; ?>"></div>
+            <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></div>
 <?php } ?>
 
                 <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>

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

@@ -37 +37 @@
                 if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
                         return false;
 
+                // On some setups GD library does not provide imagerotate() - Ticket #11536
+                if ( isset( $args['methods'] ) &&
+                         in_array( 'rotate', $args['methods'] ) &&
+                         ! function_exists('imagerotate') ){
+
+                                return false;
+                }
+
                 return true;
         }
 

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

@@ -38 +38 @@
          * @return boolean
          */
         public static function test( $args = array() ) {
-                if ( ! extension_loaded( 'imagick' ) || ! is_callable( 'Imagick', 'queryFormats' ) )
+
+                $required_methods = array(
+                        'clear',
+                        'destroy',
+                        'valid',
+                        'getimage',
+                        'writeimage',
+                        'getimageblob',
+                        'getimagegeometry',
+                        'getimageformat',
+                        'setimageformat',
+                        'setimagecompression',
+                        'setimagecompressionquality',
+                        'setimagepage',
+                        'scaleimage',
+                        'cropimage',
+                        'rotateimage',
+                        'flipimage',
+                        'flopimage',
+                );
+
+                // Check for requirements
+                if ( ! extension_loaded( 'imagick' ) ||
+                         ! class_exists( 'Imagick' ) ||
+                         ! is_callable( 'Imagick', 'queryFormats' ) ||
+                         ! class_exists( 'ImagickPixel' ) ||
+                         ! defined( 'imagick::COMPRESSION_JPEG' ) ||
+                         array_diff( $required_methods, get_class_methods( 'Imagick' ) ) ) {
+
+                        return false;
+                }
+
+                /**
+                 * 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;
         }
@@ -88 +128 @@
                         if( ! $this->image->valid() )
                                 return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
 
-                        // Select the first frame to handle animated GIFs properly
-                        $this->image->setIteratorIndex(0);
+                        // Select the first frame to handle animated images properly
+                        if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
+                                $this->image->setIteratorIndex(0);
+
                         $this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
                 }
                 catch ( Exception $e ) {