Changeset 40346 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

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

Author:

jeremyfelt

Message:

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

Props johnjamesjacoby.
Fixes #40028.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (3 diffs)

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' );