Index: /trunk/wp-admin/includes/image-edit.php
===================================================================
--- /trunk/wp-admin/includes/image-edit.php (revision 22862)
+++ /trunk/wp-admin/includes/image-edit.php (revision 22863)
@@ -41,12 +41,12 @@
// 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' ) ) ) ) { ?>
, this)" title="">
, this)" title="">
-
-
+
+
Index: /trunk/wp-includes/class-wp-image-editor-gd.php
===================================================================
--- /trunk/wp-includes/class-wp-image-editor-gd.php (revision 22862)
+++ /trunk/wp-includes/class-wp-image-editor-gd.php (revision 22863)
@@ -37,4 +37,12 @@
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;