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
This commit is contained in:
ryan 2010-11-26 21:38:38 +00:00
parent 21650c59bc
commit 6dc6d9892f
1 changed files with 2 additions and 2 deletions

View File

@ -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 );