From be2891ef1a0dee64d20931a023536cbe460ce1ee Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 3 Dec 2020 14:06:04 +0000 Subject: [PATCH] Upgrade/Install: Check `$wp_version` global for displaying "You are using a development version" message in the admin footer. This brings some consistency with the same check in `core_upgrade_preamble()` and avoids a PHP warning if `$cur->version` is not set. Additionally, remove the check for `$cur->url` property, unused since [8595]. Follow-up to [49708], [49709]. Props pbiron, afragen, audrasjb. Fixes #51892. Built from https://develop.svn.wordpress.org/trunk@49736 git-svn-id: http://core.svn.wordpress.org/trunk@49459 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update.php | 9 ++++----- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 8c8d8a0747..e01fd28eb3 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -240,15 +240,14 @@ function core_update_footer( $msg = '' ) { $cur->current = ''; } - if ( ! isset( $cur->url ) ) { - $cur->url = ''; - } - if ( ! isset( $cur->response ) ) { $cur->response = ''; } - $is_development_version = preg_match( '/alpha|beta|RC/', $cur->version ); + // Include an unmodified $wp_version. + require ABSPATH . WPINC . '/version.php'; + + $is_development_version = preg_match( '/alpha|beta|RC/', $wp_version ); if ( $is_development_version && 'latest' === $cur->response ) { $cur->response = 'development'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 87baa89e5b..a5d362afd8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49735'; +$wp_version = '5.7-alpha-49736'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.