From aeca8fcfd8039c926e6fada2ba737a80ed0d0b55 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 26 Oct 2015 18:40:01 +0000 Subject: [PATCH] After [35402], don't unnecessary run `wp_get_attachment_image_srcset()` and `wp_get_attachment_image_sizes()` in `wp_get_attachment_image()` if `srcset` is passed as an argument. See #34379. git-svn-id: https://develop.svn.wordpress.org/trunk@35404 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/media.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index 81eb18d42a..2876e35b32 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -809,16 +809,19 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa if ( empty($default_attr['alt']) ) $default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title - $attr = wp_parse_args( $attr, $default_attr ); - $srcset = wp_get_attachment_image_srcset( $attachment_id, $size ); - $sizes = wp_get_attachment_image_sizes( $attachment_id, $size, $width ); + $attr = wp_parse_args( $attr, $default_attr ); // Generate srcset and sizes if not already present. - if ( empty( $attr['srcset'] ) && $srcset && $sizes ) { - $attr['srcset'] = $srcset; + if ( empty( $attr['srcset'] ) ) { + $srcset = wp_get_attachment_image_srcset( $attachment_id, $size ); + $sizes = wp_get_attachment_image_sizes( $attachment_id, $size, $width ); - if ( empty( $attr['sizes'] ) ) { - $attr['sizes'] = $sizes; + if ( $srcset && $sizes ) { + $attr['srcset'] = $srcset; + + if ( empty( $attr['sizes'] ) ) { + $attr['sizes'] = $sizes; + } } }