Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Merge of [35820] to the 4.4 branch.

Props azaozz, kovshenin, joemcgill, mikeschroder.
See #34898.
Built from https://develop.svn.wordpress.org/branches/4.4@35821


git-svn-id: http://core.svn.wordpress.org/branches/4.4@35785 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-12-07 20:29:26 +00:00
parent 41f0bf0bc1
commit 8529c19a8d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/media.php
View File

@ -1278,6 +1278,28 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
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;
}
$width = preg_match( '/ width="([0-9]+)"/', $image, $match_width ) ? (int) $match_width[1] : 0;
$height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-RC1-35819';
$wp_version = '4.4-RC1-35821';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.