From a194fea75f7340d53134ff1ecfa5969b03735576 Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 20 Sep 2006 14:48:34 +0000 Subject: WP Merge to rev 4198 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@762 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/post.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wp-includes/post.php') diff --git a/wp-includes/post.php b/wp-includes/post.php index fa747aa..468ed37 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -99,7 +99,7 @@ function &get_post(&$post, $output = OBJECT) { } } - if ( defined(WP_IMPORTING) ) + if ( defined('WP_IMPORTING') ) unset($post_cache); if ( $output == OBJECT ) { @@ -923,12 +923,12 @@ function &get_page(&$page, $output = OBJECT) { wp_cache_add($page->ID, $page, 'pages'); $_page = $page; } else { - if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) ) { + if ( isset($GLOBALS['page']->ID) && ($page == $GLOBALS['page']->ID) ) { $_page = & $GLOBALS['page']; wp_cache_add($_page->ID, $_page, 'pages'); - } elseif ( $_page = $GLOBALS['post_cache'][$page] ) { + } elseif ( isset($_page) && $_page == $GLOBALS['post_cache'][$page] ) { return get_post($page, $output); - } elseif ( $_page = wp_cache_get($page, 'pages') ) { + } elseif ( isset($_page) && $_page == wp_cache_get($page, 'pages') ) { // Got it. } else { $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page' LIMIT 1"; -- cgit