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

Responsive images: properly arrange the parameters for the `wp_calculate_image_srcset` filter and add fix the inline documentation. 

Props joemcgill.
Fixes #34612.
Built from https://develop.svn.wordpress.org/trunk@35591


git-svn-id: http://core.svn.wordpress.org/trunk@35555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-11-09 23:30:26 +00:00
parent 5eeeeb89ce
commit 7d0aa3a54a
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/media.php
View File

@ -1074,22 +1074,23 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
* *
* @since 4.4.0 * @since 4.4.0
* *
* @param array $sources An array of sources to include in the 'srcset'. Each source * @param array $sources {
* consists of an array containing the URL and the descriptor * An array of sources to include in the 'srcset'.
* type and value (default: the image width):
* *
* image width => array( * @type type array $width {
* 'url' => string, * @type type string $url The URL of an image source in the .
* 'descriptor' => string ('w' or 'x'), * @type type string $descriptor The descriptor type used in the image candidate string, either 'w' or 'x'.
* 'value' => integer (width or pixel density) * @type type int $value The source width, if paired with a 'w' descriptor or a pixel density value
* }, * if paired with an 'x' descriptor.
* * }
* @param int $attachment_id Image attachment ID. * }
* @param array $size_array Array of width and height values in pixels (in that order). * @param array $size_array Array of width and height values in pixels (in that order).
* @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'. * @param string $image_src The 'src' of the image.
* @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
* @param int $attachment_id Image attachment ID.
*/ */
$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $attachment_id, $size_array, $image_meta ); $sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
// Only return a 'srcset' value if there is more than one source. // Only return a 'srcset' value if there is more than one source.
if ( count( $sources ) < 2 ) { if ( count( $sources ) < 2 ) {

2
wp-includes/version.php
View File

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