Index: post.php
===================================================================
--- post.php	(revision 18547)
+++ post.php	(working copy)
@@ -401,7 +401,7 @@
  * @return object stdClass object containing all the default post data as attributes
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
-	global $wpdb;
+	global $wpdb, $wp_query;
 
 	$post_title = '';
 	if ( !empty( $_REQUEST['post_title'] ) )
@@ -447,7 +447,9 @@
 	$post->post_title   = apply_filters( 'default_title',   $post_title, $post   );
 	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
 	$post->post_name = '';
-
+	
+	$wp_query->post = $post;
+	
 	return $post;
 }
 
@@ -459,8 +461,13 @@
  * @return object stdClass object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
+	global $wp_query; 
+
 	$page = get_default_post_to_edit();
 	$page->post_type = 'page';
+	
+	$wp_query->post = $page;
+	
 	return $page;
 }
 
@@ -473,12 +480,15 @@
  * @return unknown
  */
 function get_post_to_edit( $id ) {
-
+	global $wp_query;
+	
 	$post = get_post( $id, OBJECT, 'edit' );
 
 	if ( $post->post_type == 'page' )
 		$post->page_template = get_post_meta( $id, '_wp_page_template', true );
-
+	
+	$wp_query->post = $post;
+	
 	return $post;
 }