Changeset 35524

Timestamp:

11/04/2015 09:43:44 PM (9 years ago)

Author:

azaozz

Message:

Responsive images: do not generate srcset for GIFs that are inserted at full size. Prevents breaking animated GIFs.

Props joemcgill.
Fixes #34528.

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

@@ -981 +981 @@
     // Bail early if error/no width.
     if ( $image_width < 1 ) {
+        return false;
+    }
+
+    // Don't add srcset attributes to (animated) gifs that are inserted at full size.
+    if ( isset( $image_sizes['thumbnail']['mime-type'] ) && 'image/gif' === $image_sizes['thumbnail']['mime-type'] &&
+        false !== strpos( $image_src, $image_meta['file'] ) ) {
+
         return false;
     }

trunk/tests/phpunit/tests/media.php

@@ -964 +964 @@
         $this->assertSame( $image_html, wp_make_content_images_responsive( $image_html ) );
     }
+
+    /**
+     * @ticket 33641
+     * @ticket 34528
+     */
+    function test_wp_calculate_image_srcset_animated_gifs() {
+        // Mock meta for an animated gif.
+        $image_meta = array(
+            'width' => 1200,
+            'height' => 600,
+            'file' => 'animated.gif',
+            'sizes' => array(
+                'thumbnail' => array(
+                    'file' => 'animated-150x150.gif',
+                    'width' => 150,
+                    'height' => 150,
+                    'mime-type' => 'image/gif'
+                ),
+                'medium' => array(
+                    'file' => 'animated-300x150.gif',
+                    'width' => 300,
+                    'height' => 150,
+                    'mime-type' => 'image/gif'
+                ),
+                'large' => array(
+                    'file' => 'animated-1024x512.gif',
+                    'width' => 1024,
+                    'height' => 512,
+                    'mime-type' => 'image/gif'
+                ),
+            )
+        );
+
+        $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['file'];
+        // Test with soft resized size array.
+        $size_array = array(900, 450);
+
+        $this->assertFalse( wp_calculate_image_srcset( $image_src, $size_array, $image_meta ) );
+    }
 }