Ticket #48200: 48200.2.diff

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

@@ -2441 +2441 @@
                 }
         }
 
+        // 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.
         wp_update_image_subsizes( $attachment_id );

src/wp-admin/includes/image.php

@@ -251 +251 @@
                         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 );
-                }
-
                 // Resize the image
                 $resized = $editor->resize( $threshold, $threshold );
                 $rotated = null;
@@ -297 +291 @@
                         return $image_meta;
                 }
 
-                if ( ! headers_sent() ) {
-                        header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
-                }
-
                 // Rotate the image
                 $rotated = $editor->maybe_exif_rotate();
 
@@ -400 +390 @@
                 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 );
-        }
-
         // If stored EXIF data exists, rotate the source image before creating sub-sizes.
         if ( ! empty( $image_meta['image_meta'] ) ) {
                 $rotated = $editor->maybe_exif_rotate();

src/wp-admin/includes/media.php

@@ -408 +408 @@
         $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
 
         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.
                 wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );