Ticket #26410: 26410.diff

src/wp-includes/ms-blogs.php

@@ -264 +264 @@
 }
 
 /**
+ * Refresh blog details when an option is updated.
+ *
+ * @access private
+ */
+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

@@ -69 +69 @@
 remove_filter( 'option_siteurl', '_config_wp_siteurl' );
 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' );
+
 // 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' );
 

tests/phpunit/tests/ms.php

@@ -1385 +1385 @@
                         $GLOBALS['super_admins'] = $old_global;
                 }
         }
+
+        /**
+         * @ticket 26410
+         */
+        function test_blog_details_cache_invalidation() {
+                update_option( 'blogname', 'foo' );
+                $details = get_blog_details( get_current_blog_id() );
+                $this->assertEquals( 'foo', $details->blogname );
+
+                update_option( 'blogname', 'bar' );
+                $details = get_blog_details( get_current_blog_id() );
+                $this->assertEquals( 'bar', $details->blogname );
+        }
 }
 
 endif;