diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 525aaea337..f2c77ab387 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -713,6 +713,13 @@ function populate_options( array $options = array() ) { * @since 2.0.0 */ function populate_roles() { + $wp_roles = wp_roles(); + + // Disable role updates to the database while populating roles. + $original_use_db = $wp_roles->use_db; + $wp_roles->use_db = false; + + // Populate roles populate_roles_160(); populate_roles_210(); populate_roles_230(); @@ -721,6 +728,14 @@ function populate_roles() { populate_roles_270(); populate_roles_280(); populate_roles_300(); + + // Save the updated roles to the database. + if ( $original_use_db ) { + update_option( $wp_roles->role_key, $wp_roles->roles, true ); + } + + // Restore original value for writing to database. + $wp_roles->use_db = $original_use_db; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 2572b4bca0..be9eb52bbb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.9-alpha-60613'; +$wp_version = '6.9-alpha-60614'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.