Ticket #40247: 40247.diff

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

@@ -333 +333 @@
                         $details->home       = get_option( 'home' );
                         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' );
                 }
 
                 /** This filter is documented in wp-includes/ms-blogs.php */

tests/phpunit/tests/multisite/siteDetails.php

@@ -125 +125 @@
 
                 $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 );
+        }
 }
 
 endif;