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

Timestamp:

03/12/2015 08:52:42 AM (11 years ago)

Author:

jorbin

Message:

Request FTP and SSH credentials when needed during shiny updates

This is a first pass at requesting FTP and SSH credentials when needed during shiny updates. Styling and some UX improvements are still needed, but we do show the prompt and use the passed data when doing plugin installs and updates for shiny updates. There are also a couple of areas that we could improve code wise such how we create the requestFilesystemCredentials part of the localized _wpUpdatesSettings. Over the past half century, we've split the atom, we've spliced the gene and we've roamed Tranquility Base. We've reached for the stars and never have we been closer to having them in our grasp. That has nothing to do with shiny updates.

Props ericlewis, jorbin, and drewapicture for testing
Fixes #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 );
     }
 
@@ -2955 +2959 @@
     $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
     $result = $upgrader->bulk_upgrade( array( $plugin ) );
-
     if ( is_array( $result ) ) {
-        $result = $result[ $plugin ];
-    }
-
-    if ( is_wp_error( $result ) ) {
+        wp_send_json_success( $status );
+    } else if ( is_wp_error( $result ) ) {
         $status['error'] = $result->get_error_message();
         wp_send_json_error( $status );
-    }
-
-    wp_send_json_success( $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 );
+    }
 }