From 215a5fd1b7967b72aa18ad37de278318f751afdc Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 4 Aug 2022 16:29:10 +0000
Subject: [PATCH] Coding Standards: Reorder global cache groups alphabetically
 for some consistency.

Follow-up to [53823], [53824].

See #55647.
Built from https://develop.svn.wordpress.org/trunk@53832


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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index ac2a5f456b..2682b81638 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -733,23 +733,23 @@ function wp_start_object_cache() {
 	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
 		wp_cache_add_global_groups(
 			array(
-				'users',
-				'userlogins',
-				'usermeta',
-				'user_meta',
-				'useremail',
-				'userslugs',
-				'site-transient',
-				'site-options',
-				'blog-lookup',
 				'blog-details',
-				'rss',
-				'global-posts',
 				'blog-id-cache',
+				'blog-lookup',
+				'blog_meta',
+				'global-posts',
 				'networks',
 				'sites',
 				'site-details',
-				'blog_meta',
+				'site-options',
+				'site-transient',
+				'rss',
+				'users',
+				'useremail',
+				'userlogins',
+				'usermeta',
+				'user_meta',
+				'userslugs',
 			)
 		);
 
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 3d8b76a491..bb7ffb7dc7 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -554,23 +554,23 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 			} else {
 				wp_cache_add_global_groups(
 					array(
-						'users',
-						'userlogins',
-						'usermeta',
-						'user_meta',
-						'useremail',
-						'userslugs',
-						'site-transient',
-						'site-options',
-						'blog-lookup',
 						'blog-details',
-						'rss',
-						'global-posts',
 						'blog-id-cache',
+						'blog-lookup',
+						'blog_meta',
+						'global-posts',
 						'networks',
 						'sites',
 						'site-details',
-						'blog_meta',
+						'site-options',
+						'site-transient',
+						'rss',
+						'users',
+						'useremail',
+						'userlogins',
+						'usermeta',
+						'user_meta',
+						'userslugs',
 					)
 				);
 			}
@@ -645,23 +645,23 @@ function restore_current_blog() {
 			} else {
 				wp_cache_add_global_groups(
 					array(
-						'users',
-						'userlogins',
-						'usermeta',
-						'user_meta',
-						'useremail',
-						'userslugs',
-						'site-transient',
-						'site-options',
-						'blog-lookup',
 						'blog-details',
-						'rss',
-						'global-posts',
 						'blog-id-cache',
+						'blog-lookup',
+						'blog_meta',
+						'global-posts',
 						'networks',
 						'sites',
 						'site-details',
-						'blog_meta',
+						'site-options',
+						'site-transient',
+						'rss',
+						'users',
+						'useremail',
+						'userlogins',
+						'usermeta',
+						'user_meta',
+						'userslugs',
 					)
 				);
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9e1d0615b6..9662432f5b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53831';
+$wp_version = '6.1-alpha-53832';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.