Skip to content

Guard against a premature DB error in wp_initialize_site() #12860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lloc wants to merge 1 commit into
base: trunk
Choose a base branch
from
+40 −1
Open

Guard against a premature DB error in wp_initialize_site() #12860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/wp-includes/ms-site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ function wp_initialize_site( $site_id, array $args = array() ) {
$switch = false;
if ( get_current_blog_id() !== $site->id ) {
$switch = true;
remove_action( 'switch_blog', 'wp_switch_roles_and_user', 1 );
switch_to_blog( $site->id );
}

Expand Down Expand Up @@ -740,8 +741,8 @@ function wp_initialize_site( $site_id, array $args = array() ) {
clean_blog_cache( $site );

// Populate the site's roles.
populate_roles();
$wp_roles = new WP_Roles();
populate_roles();

// Populate metadata for the site.
populate_site_meta( $site->id, $args['meta'] );
Expand All @@ -761,6 +762,7 @@ function wp_initialize_site( $site_id, array $args = array() ) {
}

if ( $switch ) {
add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 );
restore_current_blog();
}

Expand Down
37 changes: 37 additions & 0 deletions tests/phpunit/tests/multisite/site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,43 @@ public function test_wp_initialize_site_user_roles() {
);
}

/**
* @ticket 37685
*/
public function test_wp_initialize_site_does_not_query_user_roles_before_tables_exist() {
global $EZSQL_ERROR;

$error_count_before = count( (array) $EZSQL_ERROR );

$result = wp_initialize_site( self::$uninitialized_site_id, array() );

$new_errors = array_slice( (array) $EZSQL_ERROR, $error_count_before );

wp_uninitialize_site( self::$uninitialized_site_id );

$this->assertTrue( $result );

foreach ( $new_errors as $error ) {
$this->assertStringNotContainsString( 'user_roles', $error['query'] );
}
}

/**
* @ticket 37685
*/
public function test_wp_initialize_site_restores_global_state() {
$blog_id_before = get_current_blog_id();
$roles_site_id_before = wp_roles()->get_site_id();

$result = wp_initialize_site( self::$uninitialized_site_id, array() );

wp_uninitialize_site( self::$uninitialized_site_id );

$this->assertTrue( $result );
$this->assertSame( $blog_id_before, get_current_blog_id() );
$this->assertSame( $roles_site_id_before, wp_roles()->get_site_id() );
}

/**
* @ticket 41333
*/
Expand Down
Loading