Ticket #39647: 39647-reuploaded.patch

src/js/_enqueues/vendor/plupload/handlers.js

@@ -279 +279 @@
         }
 }
 
-function uploadError( fileObj, errorCode, message, up ) {
+function uploadError( fileObj, errorCode, message, responseHeaders, up ) {
         var hundredmb = 100 * 1024 * 1024, max;
 
         switch ( errorCode ) {
@@ -315 +315 @@
 
                         break;
                 case plupload.HTTP_ERROR:
-                        wpQueueError( pluploadL10n.http_error );
+                        message = pluploadL10n.http_error;
+
+                        var myRegexp = /x-wp-lasterror-message: (.*)/gm;
+                        var match = myRegexp.exec( responseHeaders );
+                        if( match[1] ) {
+                                message += ' ' + match[1];
+                        }
+
+                        wpQueueError(message);
                         break;
                 case plupload.INIT_ERROR:
                         jQuery( '.media-upload-form' ).addClass( 'html-uploader' );
@@ -578 +586 @@
                                 return;
                         }
 
-                        uploadError( error.file, error.code, error.message, up );
+                        uploadError( error.file, error.code, error.message, error.responseHeaders, up);
                         up.refresh();
                 });
 

src/wp-includes/functions.php

@@ -3255 +3255 @@
                         nocache_headers();
                 }
 
+                if( isset( $parsed_args['last_error_message'] ) && $parsed_args['last_error_message']) {
+                    $sent_header = ( WP_DEBUG || ( is_user_logged_in() ) );
+                    $sent_header = apply_filters( 'wp_die_handler_sent_error_header', $sent_header );
+                    
+                    if( $sent_header ) {
+                        header( 'X-WP-lasterror-message: '.$parsed_args['last_error_message'] );
+                    }
+                }
+                
                 $text_direction = $parsed_args['text_direction'];
                 if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
                         $dir_attr = get_language_attributes();
@@ -3660 +3669 @@
 
         $args = wp_parse_args( $args, $defaults );
 
+    // Early
+    if( $message instanceof WP_Error && isset( $message->error_data['internal_server_error']['error']['message'] ) ) {
+        $args['last_error_message'] = $message->error_data['internal_server_error']['error']['message'];
+    }
+        
         if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
                 if ( ! empty( $message->errors ) ) {
                         $errors = array();
@@ -3684 +3698 @@
                                 $title = $errors[0]['data']['title'];
                         }
 
+            if( isset( $errors[0][0] ) ) {
+                $args['last_error'] = array_values( $errors[0][0] );
+            }
+                        
                         unset( $errors[0] );
                         $args['additional_errors'] = array_values( $errors );
                 } else {