diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index 02bf0299bf..33a21af6ba 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -772,10 +772,9 @@ function wp_start_object_cache() { 'rss', 'users', 'user-queries', + 'user_meta', 'useremail', 'userlogins', - 'usermeta', - 'user_meta', 'userslugs', ) ); diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php index 931433acdd..94e037f754 100644 --- a/src/wp-includes/ms-blogs.php +++ b/src/wp-includes/ms-blogs.php @@ -569,10 +569,9 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) { 'rss', 'users', 'user-queries', + 'user_meta', 'useremail', 'userlogins', - 'usermeta', - 'user_meta', 'userslugs', ) ); @@ -663,10 +662,9 @@ function restore_current_blog() { 'rss', 'users', 'user-queries', + 'user_meta', 'useremail', 'userlogins', - 'usermeta', - 'user_meta', 'userslugs', ) ); diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php index 4aa84c41b7..62ea8e2e69 100644 --- a/tests/phpunit/includes/abstract-testcase.php +++ b/tests/phpunit/includes/abstract-testcase.php @@ -413,10 +413,9 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { 'rss', 'users', 'user-queries', + 'user_meta', 'useremail', 'userlogins', - 'usermeta', - 'user_meta', 'userslugs', ) );