From 3e66b217cca0b172c8e76a69281fe9f175787fc8 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Thu, 7 Oct 2010 21:23:50 +0000
Subject: [PATCH] Avoid Notice if the query doesn't have a post set e.g. on a
 404 . Fixes #15059 props chrisbliss18.

git-svn-id: https://develop.svn.wordpress.org/trunk@15750 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index c0bbd367fc..004d4c85e0 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -440,7 +440,7 @@ class WP {
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = $wp_query->post;
+		$GLOBALS['post'] = (isset($wp_query->post)) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
 		if ( is_single() || is_page() ) {