From b2cb29aaf9f48d0636be8c34ae9b21b4fc5232f2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 19 Jun 2023 11:42:46 +0000
Subject: [PATCH] Cache API: Remove unused `usermeta` global cache group.

The `usermeta` group was introduced in WP 2.0, but was never actually used in WordPress core.

The `user_meta` group is used instead.

Follow-up to [3011], [15482], [16562], [53823], [53832], [54940].

Props ignatggeorgiev, peterwilsoncc, oglekler, pamprn09, spacedmonkey, SergeyBiryukov.
Fixes #58175.

git-svn-id: https://develop.svn.wordpress.org/trunk@55940 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/load.php                     | 3 +--
 src/wp-includes/ms-blogs.php                 | 6 ++----
 tests/phpunit/includes/abstract-testcase.php | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

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',
 			)
 		);