Changeset 48445

Timestamp:

07/12/2020 01:14:01 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Administration: Handle the result of Plugin_Upgrader::bulk_upgrade() for a plugin that is already at the latest version in the same way it is handled for themes.

This corrects a fragile check of the result in wp_ajax_update_plugin() that depended on the internal array pointer, and brings some consistency with wp_ajax_update_theme().

Follow-up to [37714], [48401].
See #50448.

Location:

trunk

Files:

• src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• src/wp-admin/includes/class-plugin-upgrader.php (modified) (1 diff)
• src/wp-admin/includes/class-theme-upgrader.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• tests/phpunit/tests/ajax/UpdatePlugin.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -4463 +4463 @@
                 wp_send_json_error( $status );
         } elseif ( is_array( $result ) && ! empty( $result[ $plugin ] ) ) {
-                $plugin_update_data = current( $result );
 
                 /*
-                 * If the `update_plugins` site transient is empty (e.g. when you update
-                 * two plugins in quick succession before the transient repopulates),
-                 * this may be the return.
+                 * Plugin is already at the latest version.
+                 *
+                 * This may also be the return value If the `update_plugins` site transient is empty,
+                 * e.g. when you update two plugins in quick succession before the transient repopulates.
                  *
                  * Preferably something can be done to ensure `update_plugins` isn't empty.
                  * For now, surface some sort of error here.
                  */
-                if ( true === $plugin_update_data ) {
-                        $status['errorMessage'] = __( 'Plugin update failed.' );
+                if ( true === $result[ $plugin ] ) {
+                        $status['errorMessage'] = $upgrader->strings['up_to_date'];
                         wp_send_json_error( $status );
                 }
@@ -4485 +4485 @@
                         $status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
                 }
+
                 wp_send_json_success( $status );
         } elseif ( false === $result ) {

trunk/src/wp-admin/includes/class-plugin-upgrader.php

@@ -392 +392 @@
                         unset( $past_failure_emails[ $plugin ] );
                 }
+
                 update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
-                reset( $results );
 
                 return $results;

trunk/src/wp-admin/includes/class-theme-upgrader.php

@@ -501 +501 @@
                         unset( $past_failure_emails[ $theme ] );
                 }
+
                 update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
-                reset( $results );
 
                 return $results;

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -661 +661 @@
          *                                               WP_Upgrader::run().
          * }
-         * @return array|false|WP_error The result from self::install_package() on success, otherwise a WP_Error,
+         * @return array|false|WP_Error The result from self::install_package() on success, otherwise a WP_Error,
          *                              or false if unable to connect to the filesystem.
          */

trunk/tests/phpunit/tests/ajax/UpdatePlugin.php

@@ -158 +158 @@
                                 'plugin'       => 'hello.php',
                                 'pluginName'   => 'Hello Dolly',
-                                'errorMessage' => 'Plugin update failed.',
+                                'errorMessage' => 'The plugin is at the latest version.',
                                 'oldVersion'   => 'Version 1.7.2',
                                 'newVersion'   => '',