Changeset 49242

Timestamp:

10/20/2020 05:38:59 PM (4 years ago)

Author:

helen

Message:

Upgrade/Install: Include "from" version for plugins/themes in email.

This can help with chasing down any issues that may arise and rolling back if necessary. We hope it's not, but it might be.

Props dkotter, garrett-eclipse, pbiron, audrasjb.
Fixes #50774.

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (6 diffs)

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

@@ -349 +349 @@
                 $theme         = wp_get_theme( $upgrader_item );
                 $item_name     = $theme->Get( 'Name' );
+                // Add the current version so that it can be reported in the notification email.
+                $item->current_version = $theme->get( 'Version' );
+                if ( empty( $item->current_version ) ) {
+                    $item->current_version = false;
+                }
                 /* translators: %s: Theme name. */
                 $skin->feedback( __( 'Updating theme: %s' ), $item_name );
@@ -356 +361 @@
                 $plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
                 $item_name     = $plugin_data['Name'];
+                // Add the current version so that it can be reported in the notification email.
+                $item->current_version = $plugin_data['Version'];
+                if ( empty( $item->current_version ) ) {
+                    $item->current_version = false;
+                }
                 /* translators: %s: Plugin name. */
                 $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
@@ -1071 +1081 @@
 
                 foreach ( $failed_updates['plugin'] as $item ) {
-                    $body[] = sprintf(
-                        /* translators: 1: Plugin name, 2: Version number. */
-                        __( '- %1$s version %2$s' ),
-                        $item->name,
-                        $item->item->new_version
-                    );
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* 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
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
 
                     $past_failure_emails[ $item->item->plugin ] = $item->item->new_version;
@@ -1089 +1109 @@
 
                 foreach ( $failed_updates['theme'] as $item ) {
-                    $body[] = sprintf(
-                        /* translators: 1: Theme name, 2: Version number. */
-                        __( '- %1$s version %2$s' ),
-                        $item->name,
-                        $item->item->new_version
-                    );
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* 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
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Theme name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
 
                     $past_failure_emails[ $item->item->theme ] = $item->item->new_version;
@@ -1112 +1142 @@
 
                 foreach ( $successful_updates['plugin'] as $item ) {
-                    $body[] = sprintf(
-                        /* translators: 1: Plugin name, 2: Version number. */
-                        __( '- %1$s version %2$s' ),
-                        $item->name,
-                        $item->item->new_version
-                    );
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* 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
+                       );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
 
                     unset( $past_failure_emails[ $item->item->plugin ] );
@@ -1130 +1170 @@
 
                 foreach ( $successful_updates['theme'] as $item ) {
-                    $body[] = sprintf(
-                        /* translators: 1: Theme name, 2: Version number. */
-                        __( '- %1$s version %2$s' ),
-                        $item->name,
-                        $item->item->new_version
-                    );
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* 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
+                        );
+                    } else {
+                        $body[] = sprintf(
+                             /* translators: 1: Theme name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
 
                     unset( $past_failure_emails[ $item->item->theme ] );