WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade/Install: Show the installed WordPress version number on WordPress Updates screen if there is a newer version available. 

This makes it easier for a user to know how significant of an update the change might be, and helps them make an informed decision about how to proceed.

Props tmdesigned, dd32, circlecube, dkarfa, hakre, scribu, MadtownLems, markshep, nbachiyski, dmchale, miqrogroove, ovann86, danieltj, sterndata, seanpaulrasmussen, mrgrt, Commeuneimage, dpacks, puneetsahalot, jonoaldersonwp, SergeyBiryukov.
Fixes #15101. See #35554, #47848.
Built from https://develop.svn.wordpress.org/trunk@48709


git-svn-id: http://core.svn.wordpress.org/trunk@48471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-08-01 19:46:04 +00:00
parent 90672b07ab
commit 85c38d54e6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/update-core.php
View File

@ -54,11 +54,13 @@ function list_core_update( $update ) {
if ( ! isset( $update->response ) || 'latest' === $update->response ) { if ( ! isset( $update->response ) || 'latest' === $update->response ) {
$current = true; $current = true;
} }
$submit = __( 'Update Now' ); $submit = __( 'Update Now' );
$form_action = 'update-core.php?action=do-core-upgrade'; $form_action = 'update-core.php?action=do-core-upgrade';
$php_version = phpversion(); $php_version = phpversion();
$mysql_version = $wpdb->db_version(); $mysql_version = $wpdb->db_version();
$show_buttons = true; $show_buttons = true;
if ( 'development' === $update->response ) { if ( 'development' === $update->response ) {
$message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' ); $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
} else { } else {
@ -124,12 +126,14 @@ function list_core_update( $update ) {
); );
} else { } else {
$message = sprintf( $message = sprintf(
/* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary. */ /* translators: 1: Installed WordPress version number, 2: URL to WordPress release notes, 3: New WordPress version number, including locale if necessary. */
__( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ), __( 'You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> automatically:' ),
$wp_version,
$version_url, $version_url,
$version_string $version_string
); );
} }
if ( ! $mysql_compat || ! $php_compat ) { if ( ! $mysql_compat || ! $php_compat ) {
$show_buttons = false; $show_buttons = false;
} }
@ -139,8 +143,10 @@ function list_core_update( $update ) {
echo '<p>'; echo '<p>';
echo $message; echo $message;
echo '</p>'; echo '</p>';
echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">'; echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
wp_nonce_field( 'upgrade-core' ); wp_nonce_field( 'upgrade-core' );
echo '<p>'; echo '<p>';
echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden"/>'; echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden"/>';
echo '<input name="locale" value="' . esc_attr( $update->locale ) . '" type="hidden"/>'; echo '<input name="locale" value="' . esc_attr( $update->locale ) . '" type="hidden"/>';
@ -160,6 +166,7 @@ function list_core_update( $update ) {
} }
} }
echo '</p>'; echo '</p>';
if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) { if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>'; echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>';
} elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
@ -170,6 +177,7 @@ function list_core_update( $update ) {
'development' !== $update->response ? $update->current : '' 'development' !== $update->response ? $update->current : ''
) . '</p>'; ) . '</p>';
} }
echo '</form>'; echo '</form>';
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-48707'; $wp_version = '5.6-alpha-48709';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.