Changeset 19902

Timestamp:

02/10/2012 05:41:37 PM (13 years ago)

Author:

ryan

Message:

Add post ID argument to _wp_post_thumbnail_html() rather than relying on a global. Post the ID from wp_ajax_set_post_thumbnail(). Props batmoo. fixes #20003

Location:

trunk/wp-admin/includes

Files:

• ajax-actions.php (modified) (2 diffs)
• post.php (modified) (2 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -1572 +1572 @@
     if ( $thumbnail_id == '-1' ) {
         if ( delete_post_thumbnail( $post_ID ) )
-            wp_die( _wp_post_thumbnail_html() );
+            wp_die( _wp_post_thumbnail_html( null, $post_ID ) );
         else
             wp_die( 0 );
@@ -1578 +1578 @@
 
     if ( set_post_thumbnail( $post_ID, $thumbnail_id ) )
-        wp_die( _wp_post_thumbnail_html( $thumbnail_id ) );
+        wp_die( _wp_post_thumbnail_html( $thumbnail_id, $post_ID ) );
     wp_die( 0 );
 }

trunk/wp-admin/includes/post.php

@@ -1144 +1144 @@
  *
  * @param int $thumbnail_id ID of the attachment used for thumbnail
+ * @param int $post_id ID of the post associated with the thumbnail, defaults to global $post_ID
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = null ) {
+function _wp_post_thumbnail_html( $thumbnail_id = null, $post_id = null ) {
     global $content_width, $_wp_additional_image_sizes, $post_ID;
+
+    if ( empty( $post_id ) )
+        $post_id = $post_ID;
+
     $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="' . esc_url( get_upload_iframe_src('image') ) . '" id="set-post-thumbnail" class="thickbox">%s</a></p>';
     $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));
@@ -1159 +1164 @@
             $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
         if ( !empty( $thumbnail_html ) ) {
-            $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$post_ID" );
+            $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$post_id" );
             $content = sprintf($set_thumbnail_link, $thumbnail_html);
             $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';