diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-31 11:20:07 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-31 11:20:07 +0000 |
commit | 47bbd1a907d44da6e2a68aef7d03f725c5b16111 (patch) | |
tree | 6e3b054584145142576ebaa26cca9f6e878ec78f /wp-includes/post.php | |
parent | 2af62b45328bed8acc4c2484964722eed237c665 (diff) | |
download | wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.tar.gz wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.tar.xz wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.zip |
WP Merge to rev 4850
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@875 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/post.php')
-rw-r--r-- | wp-includes/post.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/post.php b/wp-includes/post.php index 52ee45a..0241698 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -105,10 +105,10 @@ function &get_post(&$post, $output = OBJECT) { $post_cache[$blog_id][$post->ID] = &$post; $_post = & $post_cache[$blog_id][$post->ID]; } else { - if ( $_post = wp_cache_get($post, 'pages') ) - return get_page($_post, $output); - elseif ( isset($post_cache[$blog_id][$post]) ) + if ( isset($post_cache[$blog_id][$post]) ) $_post = & $post_cache[$blog_id][$post]; + elseif ( $_post = wp_cache_get($post, 'pages') ) + return get_page($_post, $output); else { $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1"; $_post = & $wpdb->get_row($query); |