From ce3334571dca0fe888382866722ad0bd7a5d5d7d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 30 Nov 2020 13:42:07 +0000 Subject: [PATCH] Upgrade/Install: Display "You are using a development version" message on WordPress Updates screen for Beta or RC versions. This ensures that the message is displayed when the `WP_AUTO_UPDATE_CORE` constant is set to `beta` or `rc` and the user is on a development version. Follow-up to [49245], [49254], [49292], [49638], [49708]. Props afragen, audrasjb, azaozz, SergeyBiryukov. Fixes #51822. Built from https://develop.svn.wordpress.org/trunk@49709 git-svn-id: http://core.svn.wordpress.org/trunk@49432 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/update-core.php | 10 +++++++--- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 8521bfd9e4..d3e7f2cd46 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -229,8 +229,12 @@ 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(); + + // 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 '

'; @@ -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.' ) . '

'; diff --git a/wp-includes/version.php b/wp-includes/version.php index f4e93627bb..6dd10274fe 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49708'; +$wp_version = '5.7-alpha-49709'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.