WordPress.org

Make WordPress Core

Changeset 39399


Ignore:
Timestamp:
12/01/16 00:28:00 (12 months ago)
Author:
mikeschroder
Message:

Media: Fix regression with display of small images in media library.

Fixes a regression in the media library after [38949], which caused
small images (< thumbnail size) to not display within the media library.

Accounts for images that have no intermediate sizes
in wp_prepare_attachment_for_js().

Adds test.

Merges [39396] to the 4.7 branch.

Fixes #38965 for 4.7.
Props joemcgill, clorith, mikeschroder.

Location:
branches/4.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

  • branches/4.7/src/wp-includes/media.php

    r39107 r39399  
    31403140        $response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID ); 
    31413141 
    3142     if ( $meta && ! empty( $meta['sizes'] ) ) { 
     3142    if ( $meta && ( 'image' === $type || ! empty( $meta['sizes'] ) ) ) { 
    31433143        $sizes = array(); 
    31443144 
  • branches/4.7/tests/phpunit/tests/media.php

    r39267 r39399  
    271271 
    272272    /** 
     273     * @ticket 38965 
     274     */ 
     275    function test_wp_prepare_attachment_for_js_without_image_sizes() { 
     276        // Create the attachement post. 
     277        $id = wp_insert_attachment( array( 
     278            'post_title' => 'Attachment Title', 
     279            'post_type' => 'attachment', 
     280            'post_parent' => 0, 
     281            'post_mime_type' => 'image/jpeg', 
     282            'guid' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test-image.jpg', 
     283        ) ); 
     284 
     285        // Add attachment metadata without sizes. 
     286        wp_update_attachment_metadata( $id, array( 
     287            'width' => 50, 
     288            'height' => 50, 
     289            'file' => 'test-image.jpg', 
     290        ) ); 
     291 
     292        $prepped = wp_prepare_attachment_for_js( get_post( $id ) ); 
     293 
     294        $this->assertTrue( isset( $prepped['sizes'] ) ); 
     295    } 
     296 
     297    /** 
    273298     * @ticket 19067 
    274299     * @expectedDeprecated wp_convert_bytes_to_hr 
Note: See TracChangeset for help on using the changeset viewer.