From 3d8a5fd839d3eb1642a38f25e4d2901b009371e2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 8 Mar 2021 11:29:37 +0000 Subject: [PATCH] Upgrade/Install: Display version number on the "Update now" button on WordPress Updates screen. Additionally, adjust the "Update to latest nightly" button to include the major version number of the nightly build. This makes the button labels more accurate and provides more clear understanding of what the update will be. Follow-up to [49984]. Props afragen, pbiron, SergeyBiryukov. Fixes #52513. git-svn-id: https://develop.svn.wordpress.org/trunk@50506 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/update-core.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index 35ae406799..2e9483517e 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -55,15 +55,23 @@ function list_core_update( $update ) { $current = true; } - $is_development_version = preg_match( '/alpha|beta|RC/', $version_string ); - $message = ''; - $submit = $is_development_version ? __( 'Update to latest nightly' ) : __( 'Update now' ); $form_action = 'update-core.php?action=do-core-upgrade'; $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $show_buttons = true; + // Nightly build versions have two hyphens and a commit number. + if ( preg_match( '/-\w+-\d+/', $update->current ) ) { + // Retrieve the major version number. + preg_match( '/^\d+.\d+/', $update->current, $update_major ); + /* translators: %s: WordPress version. */ + $submit = sprintf( __( 'Update to latest %s nightly' ), $update_major[0] ); + } else { + /* translators: %s: WordPress version. */ + $submit = sprintf( __( 'Update to version %s' ), $version_string ); + } + if ( 'development' === $update->response ) { $message = __( 'You can update to the latest nightly build manually:' ); } else {