From 6dc6d9892fa3767aea6bc2d5197cd9e52ecdfc8b Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 26 Nov 2010 21:38:38 +0000 Subject: [PATCH] Revert [16359]. Deal with it in 3.2. see #15361 git-svn-id: http://svn.automattic.com/wordpress/trunk@16597 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-blogs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index b24a3865c..abdd55e40 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -500,7 +500,7 @@ function switch_to_blog( $new_blog, $validate = false ) { else $global_groups = false; - wp_start_object_cache(); + wp_cache_init(); if ( function_exists('wp_cache_add_global_groups') ) { if ( is_array( $global_groups ) ) wp_cache_add_global_groups( $global_groups ); @@ -564,7 +564,7 @@ function restore_current_blog() { else $global_groups = false; - wp_start_object_cache(); + wp_cache_init(); if ( function_exists('wp_cache_add_global_groups') ) { if ( is_array( $global_groups ) ) wp_cache_add_global_groups( $global_groups );