vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 07:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: After creating a new blog, ensure the blog cache is correctly cleaned up.

Browse Source 
Props david.binda, spacedmonkey.
Fixes #46125.



git-svn-id: https://develop.svn.wordpress.org/trunk@44727 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2019-02-07 06:03:32 +00:00
parent 17a022e3d0
commit 6b2c62eee2
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/ms-site.php
View File

@@ -723,6 +723,9 @@ function wp_initialize_site( $site_id, array $args = array() ) {
)
);
// Clean blog cache after populating options.
clean_blog_cache( $site );
// Populate the site's roles.
populate_roles();
$wp_roles = new WP_Roles();

28
tests/phpunit/tests/multisite/site.php
View File

@@ -2320,6 +2320,34 @@ if ( is_multisite() ) :
return $args;
}
/**
* @ticket 46125
*/
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 );
$this->assertEquals( 'http://testsite1.example.org/test', get_site( $blog_id )->siteurl );
remove_action( 'populate_options', array( $this, 'populate_options_callback' ) );
}
/**
* Populate options callback to warm cache for blog-details / site-details cache group
*/
public function populate_options_callback() {
// Cache blog details
$blog_id = get_current_blog_id();
get_blog_details( $blog_id );
get_site( $blog_id )->siteurl;
// Set siteurl
update_option( 'siteurl', 'http://testsite1.example.org/test' );
}
}
endif;