From 9d44526db88d10f55482730dc0d256b87c87fa7b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 19 Jun 2023 11:44:22 +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.
Built from https://develop.svn.wordpress.org/trunk@55940


git-svn-id: http://core.svn.wordpress.org/trunk@55452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php     | 3 +--
 wp-includes/ms-blogs.php | 6 ++----
 wp-includes/version.php  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 02bf0299bf..33a21af6ba 100644
--- a/wp-includes/load.php
+++ b/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/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 931433acdd..94e037f754 100644
--- a/wp-includes/ms-blogs.php
+++ b/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/wp-includes/version.php b/wp-includes/version.php
index c8af02ce42..62a8fc7655 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.3-alpha-55939';
+$wp_version = '6.3-alpha-55940';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.