Changeset 28881

Timestamp:

06/28/2014 04:06:12 AM (10 years ago)

Author:

wonderboymusic

Message:

In multisite, on the updated_option action, if the option name is one of: 'blogname', 'siteurl', 'post_count' - refresh the blog details cache for the current blog id.

Adds unit test.

Props kovshenin.
Fixes #26410.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (2 diffs)
• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• tests/phpunit/tests/ms.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -265 +265 @@
 
 /**
+ * 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.
  *
@@ -904 +917 @@
         return;
     }
-    
+
     update_posts_count();
 }

trunk/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' );
+
 // 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' );

trunk/tests/phpunit/tests/ms.php

@@ -1398 +1398 @@
         $this->assertEquals( 1, get_blog_details()->post_count );
     }
+
+    /**
+     * @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 );
+    }
 }