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

Timestamp:

12/07/2015 08:07:37 PM (10 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.

File:

• trunk/src/wp-includes/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;
     }