From 5f30d3e9a0cf3548c830d127ec183d8ea0a8a571 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 30 Jul 2010 21:30:06 +0000 Subject: [PATCH] Add user_meta to global groups. see #14475 git-svn-id: http://svn.automattic.com/wordpress/trunk@15482 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 2 +- wp-includes/ms-blogs.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index 397b96675..f12be0aa7 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -378,7 +378,7 @@ function wp_start_object_cache() { wp_cache_init(); if ( function_exists( 'wp_cache_add_global_groups' ) ) { - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) ); wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) ); } } diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index 29d395a77..6219ea6c3 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -423,7 +423,7 @@ function switch_to_blog( $new_blog, $validate = false ) { if ( is_array( $global_groups ) ) wp_cache_add_global_groups( $global_groups ); else - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient', 'global-posts' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) ); wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' )); } @@ -479,7 +479,7 @@ function restore_current_blog() { if ( is_array( $global_groups ) ) wp_cache_add_global_groups( $global_groups ); else - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) ); wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' )); }