Changeset 22863

Timestamp:

11/27/2012 02:36:55 PM (12 years ago)

Author:

ryan

Message:

In wp_image_editor(), use wp_image_editor_supports() to check for rotation capabilities rather than directly checking the existence of the imagerotate function.

In WP_Image_Editor_GD::test(), check for existence of imagerotate if the rotate capability is required.

Props DH-Shredder
fixes #22597

Location:

trunk

Files:

• wp-admin/includes/image-edit.php (modified) (1 diff)
• wp-includes/class-wp-image-editor-gd.php (modified) (1 diff)

trunk/wp-admin/includes/image-edit.php

@@ -41 +41 @@
 
     // On some setups GD library does not provide imagerotate() - Ticket #11536
-    if ( function_exists('imagerotate') ) { ?>
+    if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), '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 } ?>
 

trunk/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;