From 309ff9c4ba60d2bf65aa8b340659e7ef8d69a768 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 4 Aug 2022 13:33:12 +0000
Subject: [PATCH] Coding Standards: Wrap long lines with global cache groups
 for better readability.

Follow-up to [946/tests], [1060/tests], [https://mu.trac.wordpress.org/changeset/1784 mu1784], [https://mu.trac.wordpress.org/changeset/2032 mu2032] [https://mu.trac.wordpress.org/changeset/2029 mu2029], [7986], [12128], [12603], [12688], [12732], [12755], [13125], [14009], [15482], [21403], [22092], [31347], [31348], [36258], [36393], [36413], [37918], [40343], [40347], [42836].

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


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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 62ccc18f70..ac2a5f456b 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -731,7 +731,28 @@ 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', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'blog_meta' ) );
+		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',
+				'networks',
+				'sites',
+				'site-details',
+				'blog_meta',
+			)
+		);
+
 		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
 	}
 
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 75e7f8770e..3d8b76a491 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -552,7 +552,27 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 			if ( is_array( $global_groups ) ) {
 				wp_cache_add_global_groups( $global_groups );
 			} 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', 'networks', 'sites', 'site-details', 'blog_meta' ) );
+				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',
+						'networks',
+						'sites',
+						'site-details',
+						'blog_meta',
+					)
+				);
 			}
 
 			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
@@ -623,7 +643,27 @@ function restore_current_blog() {
 			if ( is_array( $global_groups ) ) {
 				wp_cache_add_global_groups( $global_groups );
 			} 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', 'networks', 'sites', 'site-details', 'blog_meta' ) );
+				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',
+						'networks',
+						'sites',
+						'site-details',
+						'blog_meta',
+					)
+				);
 			}
 
 			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 42fb689cbf..fdb9107609 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53822';
+$wp_version = '6.1-alpha-53823';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.