Changeset 31755 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

03/12/2015 05:50:54 PM (9 years ago)

Author:

ocean90

Message:

Revert [31749], see #31528.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

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

@@ -2914 +2914 @@
         $status['error'] = $result->get_error_message();
         wp_send_json_error( $status );
-    } else if ( is_null( $result ) ) {
-        $status['errorCode'] = 'unable_to_connect_to_filesystem';
-        $status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
-        wp_send_json_error( $status );
     }
 
@@ -2959 +2955 @@
     $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
     $result = $upgrader->bulk_upgrade( array( $plugin ) );
+
     if ( is_array( $result ) ) {
-        wp_send_json_success( $status );
-    } else if ( is_wp_error( $result ) ) {
+        $result = $result[ $plugin ];
+    }
+
+    if ( is_wp_error( $result ) ) {
         $status['error'] = $result->get_error_message();
         wp_send_json_error( $status );
-    } 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.' );
-        wp_send_json_error( $status );
-    }
+    }
+
+    wp_send_json_success( $status );
 }