Changeset 37018

Timestamp:

03/16/2016 05:47:41 PM (9 years ago)

Author:

ocean90

Message:

Responsive images: Skip images with a missing $image_meta['file'] value.

Props joemcgill.
See [37002].
Fixes #35480.

Location:

trunk

Files:

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

trunk/src/wp-includes/media.php

@@ -986 +986 @@
     $image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id );
 
-    if ( empty( $image_meta['sizes'] ) || strlen( $image_meta['file'] ) < 4 ) {
+    if ( empty( $image_meta['sizes'] ) || ! isset( $image_meta['file'] ) || strlen( $image_meta['file'] ) < 4 ) {
         return false;
     }

trunk/tests/phpunit/tests/media.php

@@ -1185 +1185 @@
 
         // File name is incorrect
+        $image_meta3 = $image_meta;
+        $image_meta3['file'] = '/';
+        $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta3 ) );
+
+        // File name is incorrect
         $image_meta4 = $image_meta;
-        $image_meta4['file'] = '/';
+        unset( $image_meta4['file'] );
         $this->assertFalse( wp_calculate_image_srcset( $size_array, $image_src, $image_meta4 ) );
 
         // Intermediate size is string instead of array.
-        $image_meta3 = $image_meta;
-        $image_meta3['sizes']['medium_large'] = '';
+        $image_meta5 = $image_meta;
+        $image_meta5['sizes']['medium_large'] = '';
         unset( $srcset[768] );
         $expected_srcset = implode( ', ', $srcset );
-        $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_src, $image_meta3 ) );
+        $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_src, $image_meta5 ) );
     }