From 3ccb035e8dc48eaef6363dfd8ec9c5b132deec27 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 30 Nov 2020 16:53:05 +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.
Reviewed by azaozz, SergeyBiryukov.
Merges [49709] and [49668] to the 5.6 branch.
Fixes #51822.
Built from https://develop.svn.wordpress.org/branches/5.6@49712


git-svn-id: http://core.svn.wordpress.org/branches/5.6@49435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/update-core.php | 14 ++++++++++----
 wp-includes/version.php  |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

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 '<h2 class="response">';
 		_e( 'An updated version of WordPress is available.' );
 		echo '</h2>';
@@ -245,7 +249,7 @@ function core_upgrade_preamble() {
 			__( 'https://wordpress.org/support/article/updating-wordpress/' )
 		);
 		echo '</p></div>';
-	} elseif ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
+	} elseif ( $is_development_version ) {
 		echo '<h2 class="response">' . __( 'You are using a development version of WordPress.' ) . '</h2>';
 	} else {
 		echo '<h2 class="response">' . __( 'You have the latest version of WordPress.' ) . '</h2>';
@@ -258,6 +262,7 @@ function core_upgrade_preamble() {
 		echo '</li>';
 	}
 	echo '</ul>';
+
 	// 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 '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '</p>';
@@ -270,6 +275,7 @@ function core_upgrade_preamble() {
 			$normalized_version
 		) . '</p>';
 	}
+
 	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.