diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index ac2a5f456b..2682b81638 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -733,23 +733,23 @@ function wp_start_object_cache() { if ( function_exists( 'wp_cache_add_global_groups' ) ) { wp_cache_add_global_groups( array( - 'users', - 'userlogins', - 'usermeta', - 'user_meta', - 'useremail', - 'userslugs', - 'site-transient', - 'site-options', - 'blog-lookup', 'blog-details', - 'rss', - 'global-posts', 'blog-id-cache', + 'blog-lookup', + 'blog_meta', + 'global-posts', 'networks', 'sites', 'site-details', - 'blog_meta', + 'site-options', + 'site-transient', + 'rss', + 'users', + 'useremail', + 'userlogins', + 'usermeta', + 'user_meta', + 'userslugs', ) ); diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php index 3d8b76a491..bb7ffb7dc7 100644 --- a/src/wp-includes/ms-blogs.php +++ b/src/wp-includes/ms-blogs.php @@ -554,23 +554,23 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) { } else { wp_cache_add_global_groups( array( - 'users', - 'userlogins', - 'usermeta', - 'user_meta', - 'useremail', - 'userslugs', - 'site-transient', - 'site-options', - 'blog-lookup', 'blog-details', - 'rss', - 'global-posts', 'blog-id-cache', + 'blog-lookup', + 'blog_meta', + 'global-posts', 'networks', 'sites', 'site-details', - 'blog_meta', + 'site-options', + 'site-transient', + 'rss', + 'users', + 'useremail', + 'userlogins', + 'usermeta', + 'user_meta', + 'userslugs', ) ); } @@ -645,23 +645,23 @@ function restore_current_blog() { } else { wp_cache_add_global_groups( array( - 'users', - 'userlogins', - 'usermeta', - 'user_meta', - 'useremail', - 'userslugs', - 'site-transient', - 'site-options', - 'blog-lookup', 'blog-details', - 'rss', - 'global-posts', 'blog-id-cache', + 'blog-lookup', + 'blog_meta', + 'global-posts', 'networks', 'sites', 'site-details', - 'blog_meta', + 'site-options', + 'site-transient', + 'rss', + 'users', + 'useremail', + 'userlogins', + 'usermeta', + 'user_meta', + 'userslugs', ) ); } diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php index 11e2dcac7c..6a98dbf19d 100644 --- a/tests/phpunit/includes/abstract-testcase.php +++ b/tests/phpunit/includes/abstract-testcase.php @@ -380,23 +380,23 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { wp_cache_add_global_groups( array( - 'users', - 'userlogins', - 'usermeta', - 'user_meta', - 'useremail', - 'userslugs', - 'site-transient', - 'site-options', - 'blog-lookup', 'blog-details', - 'rss', - 'global-posts', 'blog-id-cache', + 'blog-lookup', + 'blog_meta', + 'global-posts', 'networks', 'sites', 'site-details', - 'blog_meta', + 'site-options', + 'site-transient', + 'rss', + 'users', + 'useremail', + 'userlogins', + 'usermeta', + 'user_meta', + 'userslugs', ) );