Changeset 35678

Timestamp:

11/18/2015 07:47:11 PM (9 years ago)

Author:

wonderboymusic

Message:

Media: when making images responsive, check if they already have a sizes attribute.

Adds unit test.

Props jaspermdegroot.
Fixes #34678.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (2 diffs)
• tests/phpunit/tests/media.php (modified) (3 diffs)

trunk/src/wp-includes/media.php

@@ -1206 +1206 @@
 
     foreach( $images as $image ) {
-        if ( false === strpos( $image, ' srcset="' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
+        if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
             ( $attachment_id = absint( $class_id[1] ) ) ) {
 
@@ -1303 +1303 @@
 
     if ( $srcset ) {
-        $sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+        // Check if there is already a 'sizes' attribute.
+        $sizes = strpos( $image, ' sizes=' );
+
+        if ( ! $sizes ) {
+            $sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+        }
     }
 
     if ( $srcset && $sizes ) {
         // Format the 'srcset' and 'sizes' string and escape attributes.
-        $srcset_and_sizes = sprintf( ' srcset="%s" sizes="%s"', esc_attr( $srcset ), esc_attr( $sizes ) );
+        $attr = sprintf( ' srcset="%s"', esc_attr( $srcset ) );
+
+        if ( is_string( $sizes ) ) {
+            $attr .= sprintf( ' sizes="%s"', esc_attr( $sizes ) );
+        }
 
         // Add 'srcset' and 'sizes' attributes to the image markup.
-        $image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $srcset_and_sizes . ' />', $image );
+        $image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $attr . ' />', $image );
     }
 

trunk/tests/phpunit/tests/media.php

@@ -962 +962 @@
         $img_no_width_height = str_replace( ' height="' . $size_array[1] . '"', '', $img_no_width_height );
         $img_no_size_id = str_replace( 'wp-image-', 'id-', $img );
+        $img_with_sizes_attr = str_replace( '<img ', '<img sizes="99vw" ', $img );
 
         // Manually add srcset and sizes to the markup from get_image_tag();
@@ -967 +968 @@
         $respimg_no_size_in_class = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_no_size_in_class );
         $respimg_no_width_height = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_no_width_height );
+        $respimg_with_sizes_attr = preg_replace('|<img ([^>]+) />|', '<img $1 ' . $srcset . ' />', $img_with_sizes_attr );
 
         $content = '
@@ -979 +981 @@
 
             <p>Image, no attachment ID class. Should NOT have srcset and sizes.</p>
-            %4$s';
-
-        $content_unfiltered = sprintf( $content, $img, $img_no_size_in_class, $img_no_width_height, $img_no_size_id );
-        $content_filtered = sprintf( $content, $respimg, $respimg_no_size_in_class, $respimg_no_width_height, $img_no_size_id );
+            %4$s
+
+            <p>Image, with sizes attribute. Should NOT have two sizes attributes.</p>
+            %5$s';
+
+        $content_unfiltered = sprintf( $content, $img, $img_no_size_in_class, $img_no_width_height, $img_no_size_id, $img_with_sizes_attr );
+        $content_filtered = sprintf( $content, $respimg, $respimg_no_size_in_class, $respimg_no_width_height, $img_no_size_id, $respimg_with_sizes_attr );
 
         $this->assertSame( $content_filtered, wp_make_content_images_responsive( $content_unfiltered ) );