Changeset 40385

Timestamp:

04/06/2017 05:26:04 PM (8 years ago)

Author:

swissspidy

Message:

Multisite: Handle sites cache invalidation more granularly for option updates.

Previously update_blog_option() would trigger an invalidation of that site's entire cache although these changes did not affect the content of
these caches. Furthermore changes to the special options blogname, siteurl and post_count should not invalidate the entire cache of that site, but only their respective site details cache. The option home now has the same behavior as it also belongs to the site details, but did not invalidate the cache at all previously.

Several new unit tests confirm these changes work as expected.

Fixes #40063.

Merges [40305] and [40333] to the 4.7 branch.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/ms-blogs.php (modified) (2 diffs)
• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• tests/phpunit/tests/multisite/siteDetails.php (copied) (copied from trunk/tests/phpunit/tests/multisite/siteDetails.php)

branches/4.7/src/wp-includes/ms-blogs.php

@@ -471 +471 @@
 
     wp_cache_set( 'last_changed', microtime(), 'sites' );
+}
+
+/**
+ * Cleans the site details cache for a site.
+ *
+ * @since 4.7.4
+ *
+ * @param int $site_id Optional. Site ID. Default is the current site ID.
+ */
+function clean_site_details_cache( $site_id = 0 ) {
+    $site_id = (int) $site_id;
+    if ( ! $site_id ) {
+        $site_id = get_current_blog_id();
+    }
+
+    wp_cache_delete( $site_id, 'site-details' );
+    wp_cache_delete( $site_id, 'blog-details' );
 }
 
@@ -737 +754 @@
     restore_current_blog();
 
-    refresh_blog_details( $id );
-
     return $return;
 }

branches/4.7/src/wp-includes/ms-default-filters.php

@@ -85 +85 @@
 remove_filter( 'option_home',    '_config_wp_home'    );
 
-// Some options changes should trigger blog details refresh.
-add_action( 'update_option_blogname',   'refresh_blog_details', 10, 0 );
-add_action( 'update_option_siteurl',    'refresh_blog_details', 10, 0 );
-add_action( 'update_option_post_count', 'refresh_blog_details', 10, 0 );
+// Some options changes should trigger site details refresh.
+add_action( 'update_option_blogname',   'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_siteurl',    'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_post_count', 'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_home',       'clean_site_details_cache', 10, 0 );
 
 // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.