Changeset 35753

Timestamp:

12/01/2015 08:49:13 PM (11 years ago)

Author:

wonderboymusic

Message:

Media: don't use get_media_embedded_in_content() in wp_make_content_images_responsive().

Adds unit test.

Props azaozz.
Fixes #34807.

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

@@ -1207 +1207 @@
  */
 function wp_make_content_images_responsive( $content ) {
-        $images = get_media_embedded_in_content( $content, 'img' );
+        if ( ! preg_match_all( '/<img [^>]+>/', $content, $matches ) ) {
+                return $content;
+        }
 
         $selected_images = $attachment_ids = array();
 
-        foreach( $images as $image ) {
+        foreach( $matches[0] as $image ) {
                 if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
                         ( $attachment_id = absint( $class_id[1] ) ) ) {
@@ -3507 +3509 @@
          *
          * @since 4.2.0
-         * @since 4.4.0 Added 'img' to the allowed types.
          *
          * @param array $allowed_media_types An array of allowed media types. Default media types are
-         *                                   'audio', 'video', 'object', 'embed', 'iframe', and 'img'.
-         */
-        $allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe', 'img' ) );
+         *                                   'audio', 'video', 'object', 'embed', and 'iframe'.
+         */
+        $allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe' ) );
 
         if ( ! empty( $types ) ) {

trunk/tests/phpunit/tests/media.php

@@ -1020 +1020 @@
                 $img_no_size_id = str_replace( 'wp-image-', 'id-', $img );
                 $img_with_sizes_attr = str_replace( '<img ', '<img sizes="99vw" ', $img );
+                $img_xhtml = str_replace( ' />', '/>', $img );
+                $img_html5 = str_replace( ' />', '>', $img );
 
                 // Manually add srcset and sizes to the markup from get_image_tag();
@@ -1026 +1028 @@
                 $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 );
+                $respimg_xhtml = preg_replace( '|<img ([^>]+)/>|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_xhtml );
+                $respimg_html5 = preg_replace( '|<img ([^>]+)>|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_html5 );
 
                 $content = '
@@ -1041 +1045 @@
 
                         <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 );
+                        %5$s
+
+                        <p>Image, XHTML 1.0 style (no space before the closing slash). Should have srcset and sizes.</p>
+                        %6$s
+
+                        <p>Image, HTML 5.0 style. Should have srcset and sizes.</p>
+                        %7$s';
+
+                $content_unfiltered = sprintf( $content, $img, $img_no_size_in_class, $img_no_width_height, $img_no_size_id, $img_with_sizes_attr, $img_xhtml, $img_html5 );
+                $content_filtered = sprintf( $content, $respimg, $respimg_no_size_in_class, $respimg_no_width_height, $img_no_size_id, $respimg_with_sizes_attr, $respimg_xhtml, $respimg_html5 );
 
                 $this->assertSame( $content_filtered, wp_make_content_images_responsive( $content_unfiltered ) );