WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@475 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 3 deletions

diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php
index 2bccf24..2a967f4 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -1636,8 +1636,7 @@ class WP {
 		}
 	}
 
-	function prime_caches() {
-		update_category_cache();
+	function init() {
 		get_currentuserinfo();
 	}
 
@@ -1661,8 +1660,8 @@ class WP {
 	}
 
 	function main($query_args = '') {
+		$this->init();
 		$this->parse_request($query_args);
-		$this->prime_caches();
 		$this->send_headers();
 		$this->query_posts();
 		$this->handle_404();