sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Responsive images: fix args order and streamline the srcset and sizes generation and better inline docs in get_header_image_tag().

Browse Source 
See #21389.

git-svn-id: https://develop.svn.wordpress.org/trunk@35595 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2015-11-10 01:58:38 +00:00
parent cc3e1611bc
commit d51aa96069
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wp-includes/theme.php
View File

@ -994,12 +994,13 @@ function get_header_image() {
} }
/** /**
* Create image markup for a custom header image. * Create image tag markup for a custom header image.
* *
* @since 4.4.0 * @since 4.4.0
* *
* @param array $attr Optional. Attributes for the image markup. Default empty. * @param array $attr Optional. Additional attributes for the image tag. Can be used
* @return string HTML element or empty string on failure. * to override the default attributes. Default empty.
* @return string HTML image element markup or empty string on failure.
*/ */
function get_header_image_tag( $attr = array() ) { function get_header_image_tag( $attr = array() ) {
$header = get_custom_header(); $header = get_custom_header();
@ -1027,15 +1028,12 @@ function get_header_image_tag( $attr = array() ) {
$size_array = array( $width, $height ); $size_array = array( $width, $height );
if ( is_array( $image_meta ) ) { if ( is_array( $image_meta ) ) {
$srcset = wp_calculate_image_srcset( $header->url, $size_array, $image_meta, $header->attachment_id ); $srcset = wp_calculate_image_srcset( $size_array, $header->url, $image_meta, $header->attachment_id );
$sizes = wp_get_attachment_image_sizes( $size_array, $image_meta, $header->attachment_id, $header->url ); $sizes = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id );
if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) { if ( $srcset && $sizes ) {
$attr['srcset'] = $srcset; $attr['srcset'] = $srcset;
$attr['sizes'] = $sizes;
if ( empty( $attr['sizes'] ) ) {
$attr['sizes'] = $sizes;
}
} }
} }
} }
@ -1054,9 +1052,9 @@ function get_header_image_tag( $attr = array() ) {
* *
* @since 4.4.0 * @since 4.4.0
* *
* @param string $html The HTML markup being filtered. * @param string $html The HTML image tag markup being filtered.
* @param object $header The custom header object returned by 'get_custom_header()' * @param object $header The custom header object returned by 'get_custom_header()'.
* @param array $attr An array of attributes for the image markup. * @param array $attr Array of the attributes for the image tag.
*/ */
return apply_filters( 'get_header_image_tag', $html, $header, $attr ); return apply_filters( 'get_header_image_tag', $html, $header, $attr );
} }