Ticket #46125: 46125.diff

src/wp-includes/ms-site.php

@@ -723 +723 @@
                 )
         );
 
+        // Clean blog cache after populating options.
+        clean_blog_cache( get_current_blog_id() );
+
         // Populate the site's roles.
         populate_roles();
         $wp_roles = new WP_Roles();

tests/phpunit/tests/multisite/site.php

@@ -2320 +2320 @@
 
                         return $args;
                 }
+
+                public function test_wpmu_create_blog_cache_cleanup_backward_compatible() {
+                        add_action( 'populate_options', array( $this, 'populate_options_callback' ) );
+
+                        $blog_id = wpmu_create_blog( "testsite1.example.org", "/test" , 'test', 1, array( 'public' => 1 ), 2 );
+
+                        // Should not hit blog_details cache initialised in $this->populate_options_callback tirggered during
+                        // populate_options callback's call of get_blog_details.
+                        $this->assertEquals( 'http://testsite1.example.org/test', get_blog_details( $blog_id )->siteurl );
+
+                        remove_action( 'populate_options', array( $this, 'populate_options_callback' ) );
+                }
+
+                public function populate_options_callback() {
+                        // Cache blog details
+                        get_blog_details( get_current_blog_id() );
+                        // Set siteurl
+                        update_option( 'siteurl', 'http://testsite1.example.org/test' );
+                }
         }
 
 endif;