Ticket #50774: 50774.diff

wp-admin/includes/class-wp-automatic-updater.php

@@ -1060 +1060 @@
 
                                 foreach ( $failed_updates['plugin'] as $item ) {
                                         $body[] = sprintf(
-                                                /* translators: 1: Plugin name, 2: Version number. */
-                                                __( '- %1$s version %2$s' ),
+                                                /* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
+                                                __( '- %1$s (from version %2$s to %3$s)' ),
                                                 $item->name,
+                                                $item->item->current_version,
                                                 $item->item->new_version
                                         );
 
@@ -1078 +1079 @@
 
                                 foreach ( $failed_updates['theme'] as $item ) {
                                         $body[] = sprintf(
-                                                /* translators: 1: Theme name, 2: Version number. */
-                                                __( '- %1$s version %2$s' ),
+                                                /* translators: 1: Theme name, 2: Current version number, 3: New version number. */
+                                                __( '- %1$s (from version %2$s to %3$s)' ),
                                                 $item->name,
+                                                $item->item->current_version,
                                                 $item->item->new_version
                                         );
 
@@ -1101 +1103 @@
 
                                 foreach ( $successful_updates['plugin'] as $item ) {
                                         $body[] = sprintf(
-                                                /* translators: 1: Plugin name, 2: Version number. */
-                                                __( '- %1$s version %2$s' ),
+                                                /* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
+                                                __( '- %1$s (from version %2$s to %3$s)' ),
                                                 $item->name,
+                                                $item->item->current_version,
                                                 $item->item->new_version
                                         );
 
@@ -1119 +1122 @@
 
                                 foreach ( $successful_updates['theme'] as $item ) {
                                         $body[] = sprintf(
-                                                /* translators: 1: Theme name, 2: Version number. */
-                                                __( '- %1$s version %2$s' ),
+                                                /* translators: 1: Theme name, 2: Current version number, 3: New version number. */
+                                                __( '- %1$s (from version %2$s to %3$s)' ),
                                                 $item->name,
+                                                $item->item->current_version,
                                                 $item->item->new_version
                                         );
 

wp-includes/update.php

@@ -414 +414 @@
         foreach ( $response['plugins'] as &$plugin ) {
                 $plugin = (object) $plugin;
 
+                $plugin->current_version = 'N/A';
+
+                if ( isset( $plugins[ $plugin->plugin ] ) ) {
+                        $plugin->current_version = $plugins[ $plugin->plugin ]['Version'];
+                }
+
                 if ( isset( $plugin->compatibility ) ) {
                         $plugin->compatibility = (object) $plugin->compatibility;
 
@@ -620 +626 @@
         $response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
 
         if ( is_array( $response ) ) {
+                foreach ( $response['themes'] as &$theme ) {
+                        $theme['current_version'] = 'N/A';
+
+                        if ( isset( $themes[ $theme['theme'] ] ) ) {
+                                $theme['current_version'] = $themes[ $theme['theme'] ]['Version'];
+                        }
+                }
+
+                unset( $theme );
+
                 $new_update->response     = $response['themes'];
                 $new_update->no_update    = $response['no_update'];
                 $new_update->translations = $response['translations'];