Changeset 39399

Timestamp:

12/01/2016 12:28:00 AM (8 years 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:

• . (modified) (1 prop)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

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

@@ -3140 +3140 @@
         $response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
 
-    if ( $meta && ! empty( $meta['sizes'] ) ) {
+    if ( $meta && ( 'image' === $type || ! empty( $meta['sizes'] ) ) ) {
         $sizes = array();
 

branches/4.7/tests/phpunit/tests/media.php

@@ -271 +271 @@
 
     /**
+     * @ticket 38965
+     */
+    function test_wp_prepare_attachment_for_js_without_image_sizes() {
+        // Create the attachement post.
+        $id = wp_insert_attachment( array(
+            'post_title' => 'Attachment Title',
+            'post_type' => 'attachment',
+            'post_parent' => 0,
+            'post_mime_type' => 'image/jpeg',
+            'guid' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test-image.jpg',
+        ) );
+
+        // Add attachment metadata without sizes.
+        wp_update_attachment_metadata( $id, array(
+            'width' => 50,
+            'height' => 50,
+            'file' => 'test-image.jpg',
+        ) );
+
+        $prepped = wp_prepare_attachment_for_js( get_post( $id ) );
+
+        $this->assertTrue( isset( $prepped['sizes'] ) );
+    }
+
+    /**
      * @ticket 19067
      * @expectedDeprecated wp_convert_bytes_to_hr