Changeset 22846

Timestamp:

11/26/2012 10:03:37 PM (12 years ago)

Author:

ryan

Message:

In media_buttons(), consult global post_ID if get_post() comes up with nothing.
Default postID to 0 in wp_enqueue_media().

Props nacin
fixes #22085

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -384 +384 @@
  */
 function media_buttons($editor_id = 'content') {
+    $post = get_post();
+    if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
+        $post = $GLOBALS['post_ID'];
+
     wp_enqueue_media( array(
-        'post' => get_post()
+        'post' => $post
     ) );
 

trunk/wp-includes/media.php

@@ -1394 +1394 @@
             'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
         ),
+        'postId'    => 0,
     );