Changeset 48709 for trunk/src/wp-admin/update-core.php

Timestamp:

08/01/2020 07:44:09 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/update-core.php (modified) (6 diffs)

trunk/src/wp-admin/update-core.php

@@ -55 +55 @@
         $current = true;
     }
+
     $submit        = __( 'Update Now' );
     $form_action   = 'update-core.php?action=do-core-upgrade';
@@ -60 +61 @@
     $mysql_version = $wpdb->db_version();
     $show_buttons  = true;
+
     if ( 'development' === $update->response ) {
         $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
@@ -125 +127 @@
             } else {
                 $message = sprintf(
-                    /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary. */
-                    __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ),
+                    /* translators: 1: Installed WordPress version number, 2: URL to WordPress release notes, 3: New WordPress version number, including locale if necessary. */
+                    __( 'You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> automatically:' ),
+                    $wp_version,
                     $version_url,
                     $version_string
                 );
             }
+
             if ( ! $mysql_compat || ! $php_compat ) {
                 $show_buttons = false;
@@ -140 +144 @@
     echo $message;
     echo '</p>';
+
     echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
     wp_nonce_field( 'upgrade-core' );
+
     echo '<p>';
     echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden"/>';
@@ -161 +167 @@
     }
     echo '</p>';
+
     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>';
@@ -171 +178 @@
         ) . '</p>';
     }
+
     echo '</form>';