Ticket #37531: 37531.3.diff

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

@@ -3353 +3353 @@
         }
 
         if ( is_wp_error( $result ) ) {
+                $status['errorCode']    = $result->get_error_code();
                 $status['errorMessage'] = $result->get_error_message();
                 wp_send_json_error( $status );
         } elseif ( is_null( $result ) ) {
@@ -3602 +3603 @@
         }
 
         if ( is_wp_error( $result ) ) {
+                $status['errorCode']    = $result->get_error_code();
                 $status['errorMessage'] = $result->get_error_message();
                 wp_send_json_error( $status );
         } elseif ( is_null( $result ) ) {

src/wp-admin/includes/class-wp-upgrader.php

@@ -549 +549 @@
                         $_files = $wp_filesystem->dirlist($remote_destination);
                         if ( ! empty($_files) ) {
                                 $wp_filesystem->delete($remote_source, true); //Clear out the source files.
-                                return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+                                $this->result = new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+                                return $this->result;
                         }
                 }
 

src/wp-admin/js/updates.js

@@ -526 +526 @@
                 $card.removeClass( 'plugin-card-install-failed' ).find( '.notice.notice-error' ).remove();
 
                 $document.trigger( 'wp-plugin-installing', args );
-                
+
                 return wp.updates.ajax( 'install-plugin', args );
         };
 
@@ -718 +718 @@
                 wp.a11y.speak( wp.updates.l10n.deleting, 'polite' );
 
                 $document.trigger( 'wp-plugin-deleting', args );
-                
+
                 return wp.updates.ajax( 'delete-plugin', args );
         };
 
@@ -1043 +1043 @@
                 $( '.install-theme-info, [data-slug="' + args.slug + '"]' ).removeClass( 'theme-install-failed' ).find( '.notice.notice-error' ).remove();
 
                 $document.trigger( 'wp-theme-installing', args );
-                
+
                 return wp.updates.ajax( 'install-theme', args );
         };
 
@@ -1174 +1174 @@
                 $( '.theme-info .update-message' ).remove();
 
                 $document.trigger( 'wp-theme-deleting', args );
-                
+
                 return wp.updates.ajax( 'delete-theme', args );
         };
 
@@ -1525 +1525 @@
          * @returns {boolean} Whether there is an error that needs to be handled or not.
          */
         wp.updates.maybeHandleCredentialError = function( response, action ) {
-                if ( response.errorCode && 'unable_to_connect_to_filesystem' === response.errorCode ) {
+                if ( wp.updates.shouldRequestFilesystemCredentials && response.errorCode && 'unable_to_connect_to_filesystem' === response.errorCode ) {
                         wp.updates.credentialError( response, action );
                         return true;
                 }
@@ -1982 +1982 @@
                         $bulkActionForm.find( '.manage-column [type="checkbox"]' ).prop( 'checked', false );
 
                         $document.trigger( 'wp-' + type + '-bulk-' + bulkAction, itemsSelected );
-                        
+
                         // Find all the checkboxes which have been checked.
                         itemsSelected.each( function( index, element ) {
                                 var $checkbox  = $( element ),