From 38293a6aa4dec441332c442463e0a571b69559d5 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 1 Feb 2021 14:29:01 +0000 Subject: [PATCH] Upgrade/Install: Display correct message about the current version in the admin footer. Previously, "You are using a development version" message could be displayed if the user has configured core updates to receive Beta or RC versions, but the update has not happened yet. This brings some consistency with displaying a similar message in `core_upgrade_preamble()` on WordPress Updates screen. Follow-up to [49708], [49736]. Props afragen, pbiron, azaozz, audrasjb, SergeyBiryukov. Fixes #51976. Built from https://develop.svn.wordpress.org/trunk@50121 git-svn-id: http://core.svn.wordpress.org/trunk@49800 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update.php | 17 +++++++---------- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index e01fd28eb3..956396f4c8 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -249,19 +249,16 @@ function core_update_footer( $msg = '' ) { $is_development_version = preg_match( '/alpha|beta|RC/', $wp_version ); - if ( $is_development_version && 'latest' === $cur->response ) { - $cur->response = 'development'; + if ( $is_development_version ) { + return sprintf( + /* translators: 1: WordPress version number, 2: URL to WordPress Updates screen. */ + __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), + get_bloginfo( 'version', 'display' ), + network_admin_url( 'update-core.php' ) + ); } switch ( $cur->response ) { - case 'development': - return sprintf( - /* translators: 1: WordPress version number, 2: URL to WordPress Updates screen. */ - __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), - get_bloginfo( 'version', 'display' ), - network_admin_url( 'update-core.php' ) - ); - case 'upgrade': return sprintf( '%s', diff --git a/wp-includes/version.php b/wp-includes/version.php index 04213833c9..071963c17a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-50120'; +$wp_version = '5.7-alpha-50121'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.