Ticket #26410: 26410.3.diff

src/wp-includes/ms-blogs.php

@@ -235 +235 @@
  *
  * @since MU
  *
- * @param int $blog_id Blog ID
+ * @param int $blog_id Optional. Blog ID. Defaults to current blog.
  */
-function refresh_blog_details( $blog_id ) {
+function refresh_blog_details( $blog_id = 0 ) {
         $blog_id = (int) $blog_id;
+        if ( ! $blog_id ) {
+                $blog_id = get_current_blog_id();
+        }
         $details = get_blog_details( $blog_id, false );
         if ( ! $details ) {
                 // Make sure clean_blog_cache() gets the blog ID
@@ -264 +267 @@
 }
 
 /**
- * Refresh blog details when an option is updated.
- *
- * @access private
- * @param string $option_name
- */
-function _wp_refresh_blog_details_on_updated_option( $option_name ) {
-        $options = array( 'blogname', 'siteurl', 'post_count' );
-        if ( in_array( $option_name, $options ) ) {
-                refresh_blog_details( get_current_blog_id() );
-        }
-}
-
-/**
  * Update the details for a blog. Updates the blogs table for a given blog id.
  *
  * @since MU

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

@@ -71 +71 @@
 remove_filter( 'option_home',    '_config_wp_home'    );
 
 // Some options changes should trigger blog details refresh.
-add_action( 'updated_option', '_wp_refresh_blog_details_on_updated_option' );
+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 );
 
 // 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' );