WP-r55680: Users: Change cache group from users-queries to `user-qu…

…eries`.

The cache group `users-queries` was added in https://core.trac.wordpress.org/changeset/55657. This global cache group, was named to be inline with cache groups added in https://core.trac.wordpress.org/changeset/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.

WP:Props spacedmonkey, SergeyBiryukov, peterwilsoncc.
See https://core.trac.wordpress.org/ticket/40613.

---

Merges https://core.trac.wordpress.org/changeset/55680 / WordPress/wordpress-develop@201a30d387 to ClassicPress.

src/wp-includes/class-wp-user-query.php

@@ -826,7 +826,7 @@ public function 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 );
 			}

src/wp-includes/load.php

@@ -765,12 +765,12 @@ function wp_start_object_cache() {
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
 				'useremail',
 				'userlogins',
 				'usermeta',
 				'user_meta',
 				'userslugs',
-				'users-queries',
 			)
 		);
 

src/wp-includes/ms-blogs.php

@@ -566,12 +566,12 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
 						'useremail',
 						'userlogins',
 						'usermeta',
 						'user_meta',
 						'userslugs',
-						'users-queries',
 					)
 				);
 			}
@@ -658,12 +658,12 @@ function restore_current_blog() {
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
 						'useremail',
 						'userlogins',
 						'usermeta',
 						'user_meta',
 						'userslugs',
-						'users-queries',
 					)
 				);
 			}

tests/phpunit/includes/abstract-testcase.php

@@ -406,12 +406,12 @@ public static function flush_cache() {
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
 				'useremail',
 				'userlogins',
 				'usermeta',
 				'user_meta',
 				'userslugs',
-				'users-queries',
 			)
 		);