Changeset 35678 for trunk/src/wp-includes/media.php

Timestamp:

11/18/2015 07:47:11 PM (10 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.

File:

• trunk/src/wp-includes/media.php (modified) (2 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 );
     }