Changeset 32778

Timestamp:

06/15/2015 03:31:40 AM (10 years ago)

Author:

dd32

Message:

Updates: When a error occurs during the connection phase, pass the error message back as the ajax failure message.
See #32435

File:

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

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

@@ -2938 +2938 @@
  */
 function wp_ajax_update_plugin() {
+    global $wp_filesystem;
+
     $plugin = urldecode( $_POST['plugin'] );
 
@@ -3001 +3003 @@
         $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 );
+
     }
 }