Ticket #18408: 18408.6.diff

src/wp-admin/post.php

@@ -28 +28 @@
 $post_ID = $post_id;
 
 /**
- * @global string  $post_type
- * @global object  $post_type_object
- * @global WP_Post $post             Global post object.
+ * @global string   $post_type
+ * @global object   $post_type_object
+ * @global WP_Post  $post            Global post object.
+ * @global WP_Query $wp_query        Global query object.
  */
 global $post_type, $post_type_object, $post;
 
@@ -39 +40 @@
 }
 
 if ( $post ) {
+        $wp_query->post   = $post;
         $post_type        = $post->post_type;
         $post_type_object = get_post_type_object( $post_type );
 }