Changeset 40346

Timestamp:

03/28/2017 07:35:49 PM (6 years ago)

Author:

jeremyfelt

Message:

Multisite: Respect $_wp_suspend_cache_invalidation when clearing network and site caches.

Props johnjamesjacoby.
Fixes #40028.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (3 diffs)
• tests/phpunit/tests/multisite/site.php (modified) (1 diff)

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

@@ -444 +444 @@
  * @since 3.5.0
  *
+ * @global bool $_wp_suspend_cache_invalidation
+ *
  * @param WP_Site $blog The site object to be cleared from cache.
  */
 function clean_blog_cache( $blog ) {
+    global $_wp_suspend_cache_invalidation;
+
+    if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+        return;
+    }
+
     $blog_id = $blog->blog_id;
     $domain_path_key = md5( $blog->domain . $blog->path );
@@ -452 +460 @@
     wp_cache_delete( $blog_id, 'sites' );
     wp_cache_delete( $blog_id, 'site-details' );
-    wp_cache_delete( $blog_id , 'blog-details' );
+    wp_cache_delete( $blog_id, 'blog-details' );
     wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-    wp_cache_delete(  $domain_path_key, 'blog-lookup' );
+    wp_cache_delete( $domain_path_key, 'blog-lookup' );
+    wp_cache_delete( $domain_path_key, 'blog-id-cache' );
     wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
     wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
-    wp_cache_delete( $domain_path_key, 'blog-id-cache' );
 
     /**
@@ -1150 +1158 @@
  * @since 4.6.0
  *
+ * @global bool $_wp_suspend_cache_invalidation
+ *
  * @param int|array $ids Network ID or an array of network IDs to remove from cache.
  */
 function clean_network_cache( $ids ) {
+    global $_wp_suspend_cache_invalidation;
+
+    if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+        return;
+    }
+
     foreach ( (array) $ids as $id ) {
         wp_cache_delete( $id, 'networks' );

trunk/tests/phpunit/tests/multisite/site.php

@@ -121 +121 @@
         wp_update_network_counts();
         $this->assertEquals( 2, (int) get_blog_count() );
+    }
+
+    public function test_site_caches_should_invalidate_when_invalidation_is_not_suspended() {
+        $site_id = self::factory()->blog->create();
+
+        $details = get_site( $site_id );
+
+        $suspend = wp_suspend_cache_invalidation( false );
+        update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
+        $new_details = get_site( $site_id );
+        wp_suspend_cache_invalidation( $suspend );
+
+        $this->assertNotEquals( $details->path, $new_details->path );
+    }
+
+    public function test_site_caches_should_not_invalidate_when_invalidation_is_suspended() {
+        $site_id = self::factory()->blog->create();
+
+        $details = get_site( $site_id );
+
+        $suspend = wp_suspend_cache_invalidation();
+        update_blog_details( $site_id, array( 'path' => '/a-non-random-test-path/' ) );
+        $new_details = get_site( $site_id );
+        wp_suspend_cache_invalidation( $suspend );
+
+        $this->assertEquals( $details->path, $new_details->path );
     }