Ticket #47987: 47987.3.diff

src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -100 +100 @@
                         return new WP_Error( 'rest_invalid_param', __( 'Invalid parent type.' ), array( 'status' => 400 ) );
                 }
 
+                $upload_ref   = $request->get_header( 'X-WP-UploadRef' );
+                $post_process = $request->get_header( 'X-WP-UploadPostProcess' );
+
+                if ( $upload_ref && $post_process ) {
+                        // Include upload ref functions.
+                        require_once ABSPATH . 'wp-admin/includes/file.php';
+
+                        $attachment_id = _wp_get_upload_ref_attachment_id( $upload_ref );
+
+                        if ( ! $attachment_id ) {
+                                // The upload has failed before an attachment post was created.
+                                return new WP_Error( 'upload_reference_not_found', __( 'Upload failed. Please try again.' ), array( 'status' => 404 ) );
+                        }
+
+                        if ( 'create-image-subsizes' === $post_process ) {
+                                // Try to create image sub-sizes again.
+                                // This can still be pretty slow and cause timeout or out of memory errors.
+                                // The client would need to also handle HTTP 500 responses.
+                                require_once ABSPATH . 'wp-admin/includes/image.php';
+                                wp_update_image_subsizes( $attachment_id );
+
+                                // If this completed successfully the upload ref is no longer needed.
+                                _wp_clear_upload_ref( $upload_ref );
+                        } elseif ( 'upload-failed-cleanup' === $post_process ) {
+                                // The upload failed. Cleanup.
+                                if ( wp_attachment_is_image( $attachment_id ) ) {
+                                        $attachment = get_post( $attachment_id );
+
+                                        // Posted at most 10 min ago.
+                                        if ( $attachment && ( time() - strtotime( $attachment->post_date_gmt ) < 600 ) ) {
+                                                /**
+                                                 * Runs when an image upload fails during the post-processing phase,
+                                                 * and the newly created attachment post is about to be deleted.
+                                                 *
+                                                 * @since 5.3.0
+                                                 *
+                                                 * @param int $attachment_id The attachment post ID.
+                                                 */
+                                                do_action( 'wp_upload_failed_cleanup', $attachment_id );
+
+                                                wp_delete_attachment( $attachment_id, true );
+                                                _wp_clear_upload_ref( $upload_ref );
+
+                                                // Error message is the same as in script-loader.php
+                                                $message = __( 'Post-processing of the image failed. If this is a photo or a large image, please scale it down to 2500 pixels and upload it again.' );
+                                                return new WP_Error( 'upload_failed_post_processing', $message );
+                                        }
+                                }
+
+                                return new WP_Error( 'upload_reference_not_found', __( 'Upload failed. Please try again.' ), array( 'status' => 404 ) );
+                        }
+                } else {
+                        // Initial upload request.
+                        $insert  = $this->insert_attachment( $request );
+                        $set_ref = null;
+
+                        if ( is_wp_error( $insert ) ) {
+                                return $insert;
+                        }
+
+                        // Extract by name.
+                        $attachment_id = $insert['attachment_id'];
+                        $file          = $insert['file'];
+
+                        if ( isset( $request['alt_text'] ) ) {
+                                update_post_meta( $attachment_id, '_wp_attachment_image_alt', sanitize_text_field( $request['alt_text'] ) );
+                        }
+
+                        $attachment    = get_post( $attachment_id );
+                        $fields_update = $this->update_additional_fields_for_object( $attachment, $request );
+
+                        if ( is_wp_error( $fields_update ) ) {
+                                return $fields_update;
+                        }
+
+                        // When uploading images store the unique upload ref.
+                        if ( $upload_ref && wp_attachment_is_image( $attachment_id ) ) {
+                                // Include upload ref functions.
+                                require_once ABSPATH . 'wp-admin/includes/file.php';
+                                $set_ref = _wp_set_upload_ref( $upload_ref, $attachment_id );
+                        }
+
+                        // Include admin function to get access to wp_generate_attachment_metadata().
+                        require_once ABSPATH . 'wp-admin/includes/media.php';
+
+                        // Post-process the upload (create image sub-sizes, make PDF thumbnalis, etc.) and insert attachment meta.
+                        // At this point the server may run out of resources and post-processing of uploaded images may fail.
+                        wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+
+                        // At this point the file has been uploaded successfully. The upload ref is no longer needed.
+                        if ( $set_ref ) {
+                                _wp_clear_upload_ref( $upload_ref );
+                        }
+                }
+
+                // The following runs on initial upload requests and after successfully re-trying to create image sub-sizes.
+                // At this point the file has been uploaded and post-processed successfully.
+                if ( empty( $attachment ) ) {
+                        $attachment = get_post( $attachment_id );
+                }
+
+                $request->set_param( 'context', 'edit' );
+
+                /**
+                 * Fires after a single attachment is completely created or updated via the REST API.
+                 *
+                 * @since 5.0.0
+                 *
+                 * @param WP_Post         $attachment Inserted or updated attachment object.
+                 * @param WP_REST_Request $request    Request object.
+                 * @param bool            $creating   True when creating an attachment, false when updating.
+                 */
+                do_action( 'rest_after_insert_attachment', $attachment, $request, true );
+
+                $response = $this->prepare_item_for_response( $attachment, $request );
+                $response = rest_ensure_response( $response );
+                $response->set_status( 201 );
+                $response->header( 'Location', rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $attachment_id ) ) );
+
+                return $response;
+        }
+
+        /**
+         * Inserts the attachment post in the database. Does not update the attachment meta.
+         *
+         * @since 5.3.0
+         *
+         * @param WP_REST_Request $request
+         *
+         * @return array|WP_Error
+         */
+        protected function insert_attachment( $request ) {
                 // Get the file via $_FILES or raw data.
                 $files   = $request->get_file_params();
                 $headers = $request->get_headers();
@@ -138 +270 @@
                         }
                 }
 
-                $attachment                 = $this->prepare_item_for_database( $request );
+                $attachment = $this->prepare_item_for_database( $request );
+
                 $attachment->post_mime_type = $type;
                 $attachment->guid           = $url;
 
@@ -155 +288 @@
                         } else {
                                 $id->add_data( array( 'status' => 400 ) );
                         }
+
                         return $id;
                 }
 
@@ -172 +306 @@
                  */
                 do_action( 'rest_insert_attachment', $attachment, $request, true );
 
-                // Include admin function to get access to wp_generate_attachment_metadata().
-                require_once ABSPATH . 'wp-admin/includes/media.php';
-
-                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
-                if ( isset( $request['alt_text'] ) ) {
-                        update_post_meta( $id, '_wp_attachment_image_alt', sanitize_text_field( $request['alt_text'] ) );
-                }
-
-                $fields_update = $this->update_additional_fields_for_object( $attachment, $request );
-
-                if ( is_wp_error( $fields_update ) ) {
-                        return $fields_update;
-                }
-
-                $request->set_param( 'context', 'edit' );
-
-                /**
-                 * Fires after a single attachment is completely created or updated via the REST API.
-                 *
-                 * @since 5.0.0
-                 *
-                 * @param WP_Post         $attachment Inserted or updated attachment object.
-                 * @param WP_REST_Request $request    Request object.
-                 * @param bool            $creating   True when creating an attachment, false when updating.
-                 */
-                do_action( 'rest_after_insert_attachment', $attachment, $request, true );
-
-                $response = $this->prepare_item_for_response( $attachment, $request );
-                $response = rest_ensure_response( $response );
-                $response->set_status( 201 );
-                $response->header( 'Location', rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $id ) ) );
-
-                return $response;
+                return array(
+                        'attachment_id' => $id,
+                        'file'          => $file,
+                );
         }
 
         /**