Revert [16359]. Deal with it in 3.2. see #15361
git-svn-id: https://develop.svn.wordpress.org/trunk@16597 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
8bf835d944
commit
44cb0591a1
|
@ -500,7 +500,7 @@ function switch_to_blog( $new_blog, $validate = false ) {
|
||||||
else
|
else
|
||||||
$global_groups = false;
|
$global_groups = false;
|
||||||
|
|
||||||
wp_start_object_cache();
|
wp_cache_init();
|
||||||
if ( function_exists('wp_cache_add_global_groups') ) {
|
if ( function_exists('wp_cache_add_global_groups') ) {
|
||||||
if ( is_array( $global_groups ) )
|
if ( is_array( $global_groups ) )
|
||||||
wp_cache_add_global_groups( $global_groups );
|
wp_cache_add_global_groups( $global_groups );
|
||||||
|
@ -564,7 +564,7 @@ function restore_current_blog() {
|
||||||
else
|
else
|
||||||
$global_groups = false;
|
$global_groups = false;
|
||||||
|
|
||||||
wp_start_object_cache();
|
wp_cache_init();
|
||||||
if ( function_exists('wp_cache_add_global_groups') ) {
|
if ( function_exists('wp_cache_add_global_groups') ) {
|
||||||
if ( is_array( $global_groups ) )
|
if ( is_array( $global_groups ) )
|
||||||
wp_cache_add_global_groups( $global_groups );
|
wp_cache_add_global_groups( $global_groups );
|
||||||
|
|
Loading…
Reference in New Issue