Changeset 35820

Timestamp:

12/07/2015 08:07:37 PM (9 years ago)

Author:

mikeschroder

Message:

Media: Don't generate responsive image attributes if src does not match ID in wp-image- class.

We rely on the wp-image- class to quickly find an attachment ID to add responsive image attributes.
To avoid incorrect images being displayed, do not add these attributes if the src does not match the
meta from the attachment ID in the class.

Props azaozz, kovshenin, joemcgill.
Fixes: #34898.

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

@@ -1276 +1276 @@
         strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
 
+        return $image;
+    }
+
+    $base_url = trailingslashit( _wp_upload_dir_baseurl() );
+    $image_base_url = $base_url;
+
+    $dirname = dirname( $image_meta['file'] );
+    if ( $dirname !== '.' ) {
+        $image_base_url .= trailingslashit( $dirname );
+    }
+
+    $all_sizes = wp_list_pluck( $image_meta['sizes'], 'file' );
+
+    foreach ( $all_sizes as $key => $file ) {
+        $all_sizes[ $key ] = $image_base_url . $file;
+    }
+
+    // Add the original image.
+    $all_sizes[] = $base_url . $image_meta['file'];
+
+    // Bail early if the image src doesn't match any of the known image sizes.
+    if ( ! in_array( $image_src, $all_sizes ) ) {
         return $image;
     }

trunk/tests/phpunit/tests/media.php

@@ -1057 +1057 @@
 
         $this->assertSame( $content_filtered, wp_make_content_images_responsive( $content_unfiltered ) );
+    }
+
+    /**
+     * When rendering attributes for responsive images,
+     * we rely on the 'wp-image-*' class to find the image by ID.
+     * The class name may not be consistent with attachment IDs in DB when
+     * working with imported content or when a user has edited
+     * the 'src' attribute manually. To avoid incorrect images
+     * being displayed, ensure we don't add attributes in this case.
+     *
+     * @ticket 34898
+     * @ticket 33641
+     */
+    function test_wp_make_content_images_responsive_wrong() {
+        $image = get_image_tag( self::$large_id, '', '', '', 'medium' );
+
+        // Replace the src URL
+        $image_wrong_src = preg_replace( '|src="[^"]+"|', 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/foo.jpg"', $image );
+
+        $this->assertSame( $image_wrong_src, wp_make_content_images_responsive( $image_wrong_src ) );
     }