From fe32dc424110090e6ddb6f1f1644a7115bd13912 Mon Sep 17 00:00:00 2001 From: spacedmonkey Date: Fri, 10 Mar 2023 17:51:23 +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. Built from https://develop.svn.wordpress.org/trunk@55537 git-svn-id: http://core.svn.wordpress.org/trunk@55049 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 2 ++ wp-includes/ms-blogs.php | 4 ++++ wp-includes/version.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index 6b681692e6..4f6c274747 100644 --- a/wp-includes/load.php +++ b/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/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index c5ef1c157c..0f5ff5d510 100644 --- a/wp-includes/ms-blogs.php +++ b/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/wp-includes/version.php b/wp-includes/version.php index d193d8d7ad..46d38bb8f1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55526'; +$wp_version = '6.3-alpha-55537'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.