Changeset 19999

Timestamp:

02/27/2012 07:23:03 PM (13 years ago)

Author:

ryan

Message:

Pass post id to get_upload_iframe_src() instead of relying on a global. Props tott. fixes #20003

Location:

trunk/wp-admin/includes

Files:

• media.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -393 +393 @@
 }
 
-function get_upload_iframe_src( $type = null ) {
+function get_upload_iframe_src( $type = null, $post_id = null ) {
     global $post_ID;
 
-    $uploading_iframe_ID = (int) $post_ID;
+    if ( empty( $post_id ) )
+        $post_id = $post_ID;
+
+    $uploading_iframe_ID = (int) $post_id;
     $upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, admin_url('media-upload.php') );
 

trunk/wp-admin/includes/post.php

@@ -1153 +1153 @@
         $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>';
+    $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="' . esc_url( get_upload_iframe_src('image', $post_id) ) . '" id="set-post-thumbnail" class="thickbox">%s</a></p>';
     $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));