From c421c7ead6c72ebb448c7a21f6bef3acfaab6a92 Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@git.wordpress.org>
Date: Fri, 10 Mar 2023 17:49:58 +0000
Subject: [PATCH] Cache API: Make `network-queries` and `site-queries` global
 cache groups.

Fixes a bug introduced in [55526]. The cache groups `network-queries` and `site-queries` store query results for network and site. These are network level data and should be stored in a global cache group.

Props spacedmonkey, tillkruess, flixos90.
See #57625.

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

diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
index 6b681692e6..4f6c274747 100644
--- a/src/wp-includes/load.php
+++ b/src/wp-includes/load.php
@@ -759,9 +759,11 @@ function wp_start_object_cache() {
 				'blog_meta',
 				'global-posts',
 				'networks',
+				'network-queries',
 				'sites',
 				'site-details',
 				'site-options',
+				'site-queries',
 				'site-transient',
 				'rss',
 				'users',
diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index c5ef1c157c..0f5ff5d510 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -560,9 +560,11 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 						'blog_meta',
 						'global-posts',
 						'networks',
+						'network-queries',
 						'sites',
 						'site-details',
 						'site-options',
+						'site-queries',
 						'site-transient',
 						'rss',
 						'users',
@@ -651,9 +653,11 @@ function restore_current_blog() {
 						'blog_meta',
 						'global-posts',
 						'networks',
+						'network-queries',
 						'sites',
 						'site-details',
 						'site-options',
+						'site-queries',
 						'site-transient',
 						'rss',
 						'users',
diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index 9c189bd96d..2c1b4a1d58 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -399,9 +399,11 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase {
 				'blog_meta',
 				'global-posts',
 				'networks',
+				'network-queries',
 				'sites',
 				'site-details',
 				'site-options',
+				'site-queries',
 				'site-transient',
 				'rss',
 				'users',