From 201a30d3870c3499a13b3549be065d0140c47374 Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@git.wordpress.org>
Date: Mon, 24 Apr 2023 13:51:15 +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.

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

diff --git a/src/wp-includes/class-wp-user-query.php b/src/wp-includes/class-wp-user-query.php
index c39d4bf552..e14f92901d 100644
--- a/src/wp-includes/class-wp-user-query.php
+++ b/src/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/src/wp-includes/load.php b/src/wp-includes/load.php
index 6f5a4502c7..02bf0299bf 100644
--- a/src/wp-includes/load.php
+++ b/src/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/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index e6cfcc2296..487fa5ef8a 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/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/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index dd8caa33e2..95a0e0df57 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -414,12 +414,12 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase {
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
 				'useremail',
 				'userlogins',
 				'usermeta',
 				'user_meta',
 				'userslugs',
-				'users-queries',
 			)
 		);