diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 0437af415a..1dcc071991 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -36,6 +36,7 @@ require_once dirname( __DIR__ ) . '/wp-load.php'; nocache_headers(); if ( get_option( 'db_upgraded' ) ) { + flush_rewrite_rules(); update_option( 'db_upgraded', false ); @@ -45,7 +46,9 @@ if ( get_option( 'db_upgraded' ) ) { * @since 2.8.0 */ do_action( 'after_db_upgrade' ); -} elseif ( get_option( 'db_version' ) !== $wp_db_version && empty( $_POST ) ) { + +} elseif ( (int) get_option( 'db_version' ) !== $wp_db_version && empty( $_POST ) ) { + if ( ! is_multisite() ) { wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ); exit; diff --git a/wp-includes/version.php b/wp-includes/version.php index c688806369..4a2a9a7ddd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47786'; +$wp_version = '5.5-alpha-47787'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.