Changeset 46421

Timestamp:

10/07/2019 03:28:29 PM (5 years ago)

Author:

azaozz

Message:

Upload: Set custom header with the attachment ID for all uploads from media_handle_upload(). Let the REST API endpoint set it separately.

Props timothyblynjacobs.
Fixes #48200.

Location:

trunk/src/wp-admin/includes

Files:

• ajax-actions.php (modified) (1 diff)
• image.php (modified) (3 diffs)
• media.php (modified) (1 diff)

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

@@ -2442 +2442 @@
     }
 
+    // Set a custom header with the attachment_id.
+    // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+    if ( ! headers_sent() ) {
+        header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
+    }
+
     // This can still be pretty slow and cause timeout or out of memory errors.
     // The js that handles the response would need to also handle HTTP 500 errors.

trunk/src/wp-admin/includes/image.php

@@ -253 +253 @@
         }
 
-        // Set a custom header with the attachment_id.
-        // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
-        if ( ! headers_sent() ) {
-            header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
-        }
-
         // Resize the image
         $resized = $editor->resize( $threshold, $threshold );
@@ -297 +291 @@
             // This image cannot be edited.
             return $image_meta;
-        }
-
-        if ( ! headers_sent() ) {
-            header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
         }
 
@@ -400 +390 @@
         // The image cannot be edited.
         return $image_meta;
-    }
-
-    // Set a custom header with the attachment_id.
-    // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
-    if ( ! headers_sent() ) {
-        header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
     }
 

trunk/src/wp-admin/includes/media.php

@@ -409 +409 @@
 
     if ( ! is_wp_error( $attachment_id ) ) {
+        // Set a custom header with the attachment_id.
+        // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+        if ( ! headers_sent() ) {
+            header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
+        }
+
         // The image sub-sizes are created during wp_generate_attachment_metadata().
         // This is generally slow and may cause timeouts or out of memory errors.