Ticket #40063: 40063.diff

src/wp-includes/ms-blogs.php

@@ -473 +473 @@
 }
 
 /**
+ * Cleans the site details cache for a site.
+ *
+ * @since 4.7.4
+ * @private
+ *
+ * @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( $blog_id, 'site-details' );
+        wp_cache_delete( $blog_id, 'blog-details' );
+}
+
+/**
  * Retrieves site data given a site ID or site object.
  *
  * Site data will be cached and returned after being passed through a filter.
@@ -736 +754 @@
         $return = update_option( $option, $value );
         restore_current_blog();
 
-        refresh_blog_details( $id );
-
         return $return;
 }
 

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

@@ -84 +84 @@
 remove_filter( 'option_siteurl', '_config_wp_siteurl' );
 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.
 add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );