Ticket #21391: 21391.8.patch

wp-admin/includes/media.php

@@ -2244 +2244 @@
         $title = esc_attr( $post->post_title );
         $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
 
-        $post_mime_types = get_post_mime_types();
-        $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
-        $type = array_shift( $keys );
-        $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
-
         $media_dims = '';
         $meta = wp_get_attachment_metadata( $post->ID );
         if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
@@ -2294 +2289 @@
         foreach ( $extras['hidden'] as $hidden_field => $value ) {
                 echo '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
         }
+        echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />' . "\n";
 }
 
 /**

wp-admin/includes/image-edit.php

@@ -711 +711 @@
 
                 if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
                         // Check if it's an image edit from attachment edit screen
-                        if ( false !== strpos( wp_get_referer(), 'post.php' ) ) {
+                        if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
                                 $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
                                 $return->thumbnail = $thumb_url[0];
                         } else {

wp-admin/js/image-edit.js

@@ -245 +245 @@
                         'postid': postid,
                         'history': history,
                         'target': target,
+                        'context': $('#image-edit-context') ? $('#image-edit-context').val() : null,
                         'do': 'save'
                 };