Changeset 21735 for trunk/wp-admin/includes/post.php

Timestamp:

09/04/2012 04:29:28 PM (12 years ago)

Author:

ryan

Message:

Use get_post() instead of global $post.
Make the $post argument to get_post() optional, defaulting to the current post in The Loop.

Props nacin
see #21309

File:

• trunk/wp-admin/includes/post.php (modified) (4 diffs)

trunk/wp-admin/includes/post.php

@@ -1122 +1122 @@
  *
  * @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
+ * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
-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;
-
-    $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post_id) );
+function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+    global $content_width, $_wp_additional_image_sizes;
+
+    $post = get_post( $post );
+
+    $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) );
     $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
     $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) );
@@ -1143 +1142 @@
             $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, $upload_iframe_src, $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>';
@@ -1150 +1149 @@
     }
 
-    return apply_filters( 'admin_post_thumbnail_html', $content, $post_id );
+    return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID );
 }
 
@@ -1208 +1207 @@
  */
 function _admin_notice_post_locked() {
-    global $post;
-
+    $post = get_post();
     $lock = explode( ':', get_post_meta( $post->ID, '_edit_lock', true ) );
     $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );