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

Timestamp:

03/18/2015 03:17:59 AM (6 years ago)

Author:

jorbin

Message:

Request FTP and SSH credentials when needed during shiny updates

This is a restoration of [31749] which was reverted in [31755].

It includes a number of enhancements from the original version. Namely:

• Not doing a credential check in src/wp-includes/script-loader.php
• Add new function wp_print_request_filesystem_credentials_modal
• update the version number in the list table when a plugin is updated

UI still needs further work, but this basic version should enable more testing

Props ericlewis, jorbin
See #31528

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (3 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 );
     }
 
@@ -2934 +2938 @@
 
     $status = array(
-        'update' => 'plugin',
-        'plugin' => $plugin,
-        'slug'   => sanitize_key( $_POST['slug'] ),
+        'update'     => 'plugin',
+        'plugin'     => $plugin,
+        'slug'       => sanitize_key( $_POST['slug'] ),
+        'oldVersion' => '',
+        'newVersion' => '',
     );
+    $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+    if ( $plugin_data['Version'] ) {
+        $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+    }
 
     if ( ! current_user_can( 'update_plugins' ) ) {
@@ -2957 +2967 @@
 
     if ( is_array( $result ) ) {
-        $result = $result[ $plugin ];
-    }
-
-    if ( is_wp_error( $result ) ) {
+        $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.
+         *
+         * Preferably something can be done to ensure `update_plugins` isn't empty.
+         * For now, surface some sort of error here.
+         */
+        if ( $plugin_update_data === true ) {
+            wp_send_json_error( $status );
+        }
+        $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+        if ( $plugin_data['Version'] ) {
+            $status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+        }
+        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 );
+    }
 }