Changeset 46382 for trunk/src/wp-admin/includes/image.php

Timestamp:

10/03/2019 09:00:10 PM (7 years ago)

Author:

azaozz

Message:

Upload: Fix the method used to create image sub-sizes when uploading fails with a PHP fatal error. Use a custom header to send the new attachment post ID even in HTTP 500 responses instead of an upload reference sent by the client. Also add another cap check and remove the action when deleting an attachment post during a failed upload cleanup.

Props timothyblynjacobs, clorith, azaozz.
Fixes #48200.

File:

• trunk/src/wp-admin/includes/image.php (modified) (5 diffs)

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

@@ -252 +252 @@
                 }
 
+                // 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 );
@@ -274 +280 @@
                                         $image_meta['image_meta']['orientation'] = 1;
                                 }
+
+                                wp_update_attachment_metadata( $attachment_id, $image_meta );
                         } else {
                                 // TODO: handle errors.
@@ -288 +296 @@
                         // This image cannot be edited.
                         return $image_meta;
+                }
+
+                if ( ! headers_sent() ) {
+                        header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
                 }
 
@@ -304 +316 @@
                                         $image_meta['image_meta']['orientation'] = 1;
                                 }
+
+                                wp_update_attachment_metadata( $attachment_id, $image_meta );
                         } else {
                                 // TODO: handle errors.
@@ -385 +399 @@
                 // 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 );
         }