From 3d744b601c84228a4c7a03c0cbcfc865943e12d6 Mon Sep 17 00:00:00 2001
From: spacedmonkey <spacedmonkey@git.wordpress.org>
Date: Mon, 24 Apr 2023 13:53:22 +0000
Subject: [PATCH] Users: Change cache group from `users-queries` to
 `user-queries`.

The cache group `users-queries` was added in [55657]. This global cache group, was named to be inline with cache groups added in [55526]. However, the naming of the group does not match, as other cache groups, do not end with s at the end. This change fix this naming.

Props spacedmonkey, SergeyBiryukov, peterwilsoncc.
See #40613.
Built from https://develop.svn.wordpress.org/trunk@55680


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

diff --git a/wp-includes/class-wp-user-query.php b/wp-includes/class-wp-user-query.php
index c39d4bf552..e14f92901d 100644
--- a/wp-includes/class-wp-user-query.php
+++ b/wp-includes/class-wp-user-query.php
@@ -826,7 +826,7 @@ class WP_User_Query {
 			";
 			$cache_value   = false;
 			$cache_key     = $this->generate_cache_key( $qv, $this->request );
-			$cache_group   = 'users-queries';
+			$cache_group   = 'user-queries';
 			if ( $qv['cache_results'] ) {
 				$cache_value = wp_cache_get( $cache_key, $cache_group );
 			}
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 6f5a4502c7..02bf0299bf 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -771,12 +771,12 @@ function wp_start_object_cache() {
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
 				'useremail',
 				'userlogins',
 				'usermeta',
 				'user_meta',
 				'userslugs',
-				'users-queries',
 			)
 		);
 
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index e6cfcc2296..487fa5ef8a 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -568,12 +568,12 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
 						'useremail',
 						'userlogins',
 						'usermeta',
 						'user_meta',
 						'userslugs',
-						'users-queries',
 					)
 				);
 			}
@@ -662,12 +662,12 @@ function restore_current_blog() {
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
 						'useremail',
 						'userlogins',
 						'usermeta',
 						'user_meta',
 						'userslugs',
-						'users-queries',
 					)
 				);
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 403b335844..f831e9a318 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.3-alpha-55678';
+$wp_version = '6.3-alpha-55680';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.