WordPress.org

Make WordPress Core

Changeset 46421


Ignore:
Timestamp:
10/07/2019 03:28:29 PM (10 days 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/ajax-actions.php

    r46382 r46421  
    24422442    }
    24432443
     2444    // Set a custom header with the attachment_id.
     2445    // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
     2446    if ( ! headers_sent() ) {
     2447        header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
     2448    }
     2449
    24442450    // This can still be pretty slow and cause timeout or out of memory errors.
    24452451    // The js that handles the response would need to also handle HTTP 500 errors.
  • trunk/src/wp-admin/includes/image.php

    r46398 r46421  
    253253        }
    254254
    255         // Set a custom header with the attachment_id.
    256         // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
    257         if ( ! headers_sent() ) {
    258             header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
    259         }
    260 
    261255        // Resize the image
    262256        $resized = $editor->resize( $threshold, $threshold );
     
    297291            // This image cannot be edited.
    298292            return $image_meta;
    299         }
    300 
    301         if ( ! headers_sent() ) {
    302             header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
    303293        }
    304294
     
    400390        // The image cannot be edited.
    401391        return $image_meta;
    402     }
    403 
    404     // Set a custom header with the attachment_id.
    405     // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
    406     if ( ! headers_sent() ) {
    407         header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
    408392    }
    409393
  • trunk/src/wp-admin/includes/media.php

    r46382 r46421  
    409409
    410410    if ( ! is_wp_error( $attachment_id ) ) {
     411        // Set a custom header with the attachment_id.
     412        // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
     413        if ( ! headers_sent() ) {
     414            header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
     415        }
     416
    411417        // The image sub-sizes are created during wp_generate_attachment_metadata().
    412418        // This is generally slow and may cause timeouts or out of memory errors.
Note: See TracChangeset for help on using the changeset viewer.