Changeset 22749

Timestamp:

11/21/2012 12:05:24 PM (12 years ago)

Author:

nacin

Message:

Properly refresh the thumbnail on post.php after an image edit. props ocean90. see #21391.

Location:

trunk/wp-admin/includes

Files:

• image-edit.php (modified) (1 diff)
• media.php (modified) (1 diff)

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

@@ -711 +711 @@
 
         if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
-            $file_url = wp_get_attachment_url($post_id);
-            if ( $thumb = $meta['sizes']['thumbnail'] )
-                $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
-            else
-                $return->thumbnail = "$file_url?w=128&h=128";
+            // Check if it's an image edit from attachment edit screen
+            if ( false !== strpos( wp_get_referer(), 'post.php' ) ) {
+                $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+                $return->thumbnail = $thumb_url[0];
+            } else {
+                $file_url = wp_get_attachment_url($post_id);
+                if ( $thumb = $meta['sizes']['thumbnail'] )
+                    $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+                else
+                    $return->thumbnail = "$file_url?w=128&h=128";
+            }
         }
     } else {

trunk/wp-admin/includes/media.php

@@ -2270 +2270 @@
 
         <div class="wp_attachment_image" id="media-head-<?php echo $attachment_id; ?>">
-            <p><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" width="<?php echo $thumb_url[1]; ?>" alt="" /></p>
+            <p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
             <p><?php echo $image_edit_button; ?></p>
         </div>