Changeset 33302

Timestamp:

07/17/2015 03:58:23 AM (11 years ago)

Author:

dd32

Message:

Updates: Correctly identify more failed update cases.
This checks for a WP_Error being raised during an individual update, in addition to just the bootstrap error cases.
When a error occurs during the connection phase, pass the error message back as the ajax failure message.

Merges [32571] & [32778] to the 4.2 branch

See #32473, #32435

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/ajax-actions.php (modified) (3 diffs)

branches/4.2/src/wp-admin/includes/ajax-actions.php

@@ -2884 +2884 @@
  */
 function wp_ajax_update_plugin() {
+        global $wp_filesystem;
+
         $plugin = urldecode( $_POST['plugin'] );
 
@@ -2910 +2912 @@
         wp_update_plugins();
 
-        $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+        $skin = new Automatic_Upgrader_Skin();
+        $upgrader = new Plugin_Upgrader( $skin );
         $result = $upgrader->bulk_upgrade( array( $plugin ) );
 
-        if ( is_array( $result ) ) {
+        if ( is_array( $result ) && empty( $result[$plugin] ) && is_wp_error( $skin->result ) ) {
+                $result = $skin->result;
+        }
+
+        if ( is_array( $result ) && !empty( $result[ $plugin ] ) ) {
                 $plugin_update_data = current( $result );
 
@@ -2939 +2946 @@
                 $status['error'] = $result->get_error_message();
                 wp_send_json_error( $status );
-        } else if ( is_bool( $result ) && ! $result ) {
+
+        } else if ( is_bool( $result ) && ! $result ) {
                 $status['errorCode'] = 'unable_to_connect_to_filesystem';
                 $status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
+
+                // Pass through the error from WP_Filesystem if one was raised
+                if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+                        $status['error'] = $wp_filesystem->errors->get_error_message();
+                }
+
                 wp_send_json_error( $status );
+
         }
 }