Changeset 22807

Timestamp:

11/22/2012 03:43:16 AM (12 years ago)

Author:

koopersmith

Message:

Media: Replace the thumbnail on post.php using a request variable instead of the referer. props ocean90. fixes #21391.

Location:

trunk/wp-admin

Files:

• includes/image-edit.php (modified) (1 diff)
• includes/media.php (modified) (2 diffs)
• js/image-edit.js (modified) (1 diff)

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

@@ -712 +712 @@
         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];

trunk/wp-admin/includes/media.php

@@ -2245 +2245 @@
     $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 );
@@ -2295 +2290 @@
         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";
 }
 

trunk/wp-admin/js/image-edit.js

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