diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 5895aad70f..d3e7f2cd46 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -229,10 +229,14 @@ function dismissed_updates() { function core_upgrade_preamble() { global $required_php_version, $required_mysql_version; - $wp_version = get_bloginfo( 'version' ); - $updates = get_core_updates(); + $updates = get_core_updates(); - if ( isset( $updates[0] ) && isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) { + // Include an unmodified $wp_version. + require ABSPATH . WPINC . '/version.php'; + + $is_development_version = preg_match( '/alpha|beta|RC/', $wp_version ); + + if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) { echo '

'; _e( 'An updated version of WordPress is available.' ); echo '

'; @@ -245,7 +249,7 @@ function core_upgrade_preamble() { __( 'https://wordpress.org/support/article/updating-wordpress/' ) ); echo '

'; - } elseif ( isset( $updates[0] ) && 'development' === $updates[0]->response ) { + } elseif ( $is_development_version ) { echo '

' . __( 'You are using a development version of WordPress.' ) . '

'; } else { echo '

' . __( 'You have the latest version of WordPress.' ) . '

'; @@ -258,6 +262,7 @@ function core_upgrade_preamble() { echo ''; } echo ''; + // Don't show the maintenance mode notice when we are only showing a single re-install option. if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) { echo '

' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '

'; @@ -270,6 +275,7 @@ function core_upgrade_preamble() { $normalized_version ) . '

'; } + dismissed_updates(); } diff --git a/wp-includes/version.php b/wp-includes/version.php index c0f839f65f..7f051bd0d5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-RC1-49711'; +$wp_version = '5.6-RC1-49712'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.