Changeset 40344

Timestamp:

03/28/2017 02:31:13 AM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Allow falsy properties to be cached in site-details.

In previous iterations of WP_Site, there was concern that not all properties would be available when storing a site's details in cache. When introduced in [37918], an ms_loaded check was added to address this concern. Any properties that are still false after ms_loaded really are false and can be cached as such.

Props flixos90.
Fixes #40247.

Location:

trunk

Files:

• src/wp-includes/class-wp-site.php (modified) (1 diff)
• tests/phpunit/tests/multisite/siteDetails.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-site.php

@@ -334 +334 @@
             restore_current_blog();
 
-            $cache_details = true;
-            foreach ( array( 'blogname', 'siteurl', 'post_count', 'home' ) as $field ) {
-                if ( false === $details->$field ) {
-                    $cache_details = false;
-                    break;
-                }
-            }
-
-            if ( $cache_details ) {
-                wp_cache_set( $this->blog_id, $details, 'site-details' );
-            }
+            wp_cache_set( $this->blog_id, $details, 'site-details' );
         }
 

trunk/tests/phpunit/tests/multisite/siteDetails.php

@@ -126 +126 @@
         $this->assertNotFalse( $cached_result );
     }
+
+    /**
+     * @ticket 40247
+     */
+    public function test_site_details_cached_including_false_values() {
+        $id = self::factory()->blog->create();
+
+        $site = get_site( $id );
+
+        // Trigger retrieving site details (post_count is not set on new sites)
+        $post_count = $site->post_count;
+
+        $cached_details = wp_cache_get( $site->id, 'site-details' );
+
+        wpmu_delete_blog( $id, true );
+        wp_update_network_site_counts();
+
+        $this->assertNotFalse( $cached_details );
+    }
 }