Ticket #53232: 53232.8.diff
File 53232.8.diff, 16.8 KB (added by , 3 years ago) |
---|
-
src/wp-includes/media.php
diff --git src/wp-includes/media.php src/wp-includes/media.php index 2b46167afc..32dca8ef1e 100644
function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f 1077 1077 } 1078 1078 } 1079 1079 1080 // Add a `decoding` attribute. 1081 $attr['decoding'] = 'async'; 1082 1080 1083 /** 1081 1084 * Filters the list of attachment image attributes. 1082 1085 * … … function wp_filter_content_tags( $content, $context = null ) { 1854 1857 */ 1855 1858 $filtered_image = apply_filters( 'wp_content_img_tag', $filtered_image, $context, $attachment_id ); 1856 1859 1860 // Add 'decoding=async' attribute unless a 'decoding' attribute is already present. 1861 if ( false === strpos( $filtered_image, ' decoding=' ) ) { 1862 $filtered_image = wp_img_tag_add_decoding_async_attr( $filtered_image, $context ); 1863 } 1864 1857 1865 if ( $filtered_image !== $match[0] ) { 1858 1866 $content = str_replace( $match[0], $filtered_image, $content ); 1859 1867 } … … function wp_img_tag_add_loading_attr( $image, $context ) { 1934 1942 return $image; 1935 1943 } 1936 1944 1945 /** 1946 * Add `decoding` attribute to an `img` HTML tag. 1947 * 1948 * The `decoding` attribute allows developers to indicate whether the 1949 * browser can decode the image off the main thread (`async`), on the 1950 * main thread (`sync`) or as determined by the browser (`auto`). 1951 * 1952 * By default WordPress adds `decoding="async"` to images but developers 1953 * can use the {@see 'wp_img_tag_add_decoding_attr'} filter to modify this 1954 * to remove the attribute or set it to another accepted value. 1955 * 1956 * @since 6.0.0 1957 * 1958 * @param string $image The HTML `img` tag where the attribute should be added. 1959 * @param string $context Additional context to pass to the filters. 1960 * @return string Converted `img` tag with `decoding` attribute added. 1961 */ 1962 function wp_img_tag_add_decoding_async_attr( $image, $context ) { 1963 /** 1964 * Filters the `decoding` attribute value to add to an image. Default `async`. 1965 * 1966 * Returning `false` or an empty string will not add the attribute. 1967 * 1968 * @since 6.0.0 1969 * 1970 * @param string|bool $value The `decoding` attribute value. Returning a falsey value will result in 1971 * the attribute being omitted for the image. Otherwise, it may be: 1972 * 'async' (default), 'sync', or 'auto'. 1973 * @param string $image The HTML `img` tag to be filtered. 1974 * @param string $context Additional context about how the function was called or where the img tag is. 1975 */ 1976 $value = apply_filters( 'wp_img_tag_add_decoding_attr', 'async', $image, $context ); 1977 if ( in_array( $value, array( 'async', 'sync', 'auto' ), true ) ) { 1978 $image = str_replace( '<img ', '<img decoding="' . esc_attr( $value ) . '" ', $image ); 1979 } 1980 1981 return $image; 1982 } 1983 1937 1984 /** 1938 1985 * Adds `width` and `height` attributes to an `img` HTML tag. 1939 1986 * -
src/wp-includes/pluggable.php
diff --git src/wp-includes/pluggable.php src/wp-includes/pluggable.php index fdbfdea250..de4ced9bd9 100644
if ( ! function_exists( 'get_avatar' ) ) : 2694 2694 'force_display' => false, 2695 2695 'loading' => null, 2696 2696 'extra_attr' => '', 2697 'decoding' => 'async', 2697 2698 ); 2698 2699 2699 2700 if ( wp_lazy_loading_enabled( 'img', 'get_avatar' ) ) { … … if ( ! function_exists( 'get_avatar' ) ) : 2781 2782 $extra_attr .= "loading='{$loading}'"; 2782 2783 } 2783 2784 2785 if ( isset( $args['decoding'] ) && in_array( $args['decoding'], array( 'async', 'sync', 'auto' ) ) && ! preg_match( '/\bdecoding\s*=/', $extra_attr ) ) { 2786 if ( ! empty( $extra_attr ) ) { 2787 $extra_attr .= ' '; 2788 } 2789 $extra_attr .= "decoding='{$args['decoding']}'"; 2790 } 2791 2784 2792 $avatar = sprintf( 2785 2793 "<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>", 2786 2794 esc_attr( $args['alt'] ), -
tests/phpunit/tests/avatar.php
diff --git tests/phpunit/tests/avatar.php tests/phpunit/tests/avatar.php index 336ab611e2..026809b4a1 100644
class Tests_Avatar extends WP_UnitTestCase { 169 169 170 170 public function test_get_avatar() { 171 171 $img = get_avatar( 1 ); 172 $this->assertSame( preg_match( "|^<img alt='[^']*' src='[^']*' srcset='[^']*' class='[^']*' height='[^']*' width='[^']*' loading='lazy' />$|", $img ), 1 );172 $this->assertSame( preg_match( "|^<img alt='[^']*' src='[^']*' srcset='[^']*' class='[^']*' height='[^']*' width='[^']*' loading='lazy' decoding='async'/>$|", $img ), 1 ); 173 173 } 174 174 175 175 public function test_get_avatar_size() { -
tests/phpunit/tests/media.php
diff --git tests/phpunit/tests/media.php tests/phpunit/tests/media.php index 8f3340aaf7..8b4ebce620 100644
EOF; 1474 1474 public function test_wp_get_attachment_image_defaults() { 1475 1475 $image = image_downsize( self::$large_id, 'thumbnail' ); 1476 1476 $expected = sprintf( 1477 '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" />',1477 '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" />', 1478 1478 $image[1], 1479 1479 $image[2], 1480 1480 $image[0] … … EOF; 1512 1512 1513 1513 $image = image_downsize( self::$large_id, 'thumbnail' ); 1514 1514 $expected = sprintf( 1515 '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="Some very clever alt text" loading="lazy" />',1515 '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="Some very clever alt text" loading="lazy" decoding="async" />', 1516 1516 $image[1], 1517 1517 $image[2], 1518 1518 $image[0] … … EOF; 2248 2248 $respimg_xhtml, 2249 2249 $respimg_html5 2250 2250 ); 2251 $content_filtered = wp_img_tag_add_decoding_async_attr( $content_filtered, 'the_content' ); 2251 2252 2252 2253 // Do not add width, height, and loading. 2253 2254 add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' ); … … EOF; 2273 2274 public function test_wp_filter_content_tags_srcset_sizes_wrong() { 2274 2275 $img = get_image_tag( self::$large_id, '', '', '', 'medium' ); 2275 2276 $img = wp_img_tag_add_loading_attr( $img, 'test' ); 2277 $img = wp_img_tag_add_decoding_async_attr( $img, 'the_content' ); 2276 2278 2277 2279 // Replace the src URL. 2278 2280 $image_wrong_src = preg_replace( '|src="[^"]+"|', 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/foo.jpg"', $img ); … … EOF; 2287 2289 // Generate HTML and add a dummy srcset attribute. 2288 2290 $img = get_image_tag( self::$large_id, '', '', '', 'medium' ); 2289 2291 $img = wp_img_tag_add_loading_attr( $img, 'test' ); 2292 $img = wp_img_tag_add_decoding_async_attr( $img, 'the_content' ); 2290 2293 $img = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . 'srcset="image2x.jpg 2x" />', $img ); 2291 2294 2292 2295 // The content filter should return the image unchanged. … … EOF; 2334 2337 */ 2335 2338 public function test_wp_filter_content_tags_filter_with_identical_image_tags_custom_attributes() { 2336 2339 $img = get_image_tag( self::$large_id, '', '', '', 'large' ); 2337 $img = str_replace( '<img ', '<img srcset="custom" sizes="custom" loading="custom" ', $img );2340 $img = str_replace( '<img ', '<img srcset="custom" sizes="custom" loading="custom" decoding="custom"', $img ); 2338 2341 $content = "$img\n$img"; 2339 2342 2340 2343 add_filter( … … EOF; 2359 2362 add_filter( 'wp_img_tag_add_loading_attr', '__return_false' ); 2360 2363 add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' ); 2361 2364 add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' ); 2365 add_filter( 'wp_img_tag_add_decoding_attr', '__return_false' ); 2362 2366 2363 2367 add_filter( 2364 2368 'wp_content_img_tag', … … EOF; 2461 2465 $respimg_https, 2462 2466 $respimg_relative 2463 2467 ); 2468 $expected = wp_img_tag_add_decoding_async_attr( $expected, 'the_content' ); 2464 2469 2465 2470 $actual = wp_filter_content_tags( $unfiltered ); 2466 2471 … … EOF; 2605 2610 'src="' . $uploads_url . 'test-image-testsize-999x999.jpg" ' . 2606 2611 'class="attachment-testsize size-testsize" alt="" loading="lazy" ' . 2607 2612 'srcset="' . $uploads_url . 'test-image-testsize-999x999.jpg 999w, ' . $uploads_url . $basename . '-150x150.jpg 150w" ' . 2608 'sizes="(max-width: 999px) 100vw, 999px" />';2613 'sizes="(max-width: 999px) 100vw, 999px" decoding="async" />'; 2609 2614 2610 2615 $actual = wp_get_attachment_image( self::$large_id, 'testsize' ); 2611 2616 … … EOF; 2910 2915 %4$s'; 2911 2916 2912 2917 $content_unfiltered = sprintf( $content, $img, $img_no_width_height, $img_no_width, $img_no_height ); 2913 $content_filtered = sprintf( $content, $img, $respimg_no_width_height, $img_no_width, $img_no_height);2918 $content_filtered = wp_img_tag_add_decoding_async_attr( sprintf( $content, $img, $respimg_no_width_height, $img_no_width, $img_no_height ), 'the_content' ); 2914 2919 2915 2920 // Do not add loading, srcset, and sizes. 2916 2921 add_filter( 'wp_img_tag_add_loading_attr', '__return_false' ); … … EOF; 2968 2973 %8$s'; 2969 2974 2970 2975 $content_unfiltered = sprintf( $content, $img, $img_xhtml, $img_html5, $img_eager, $img_no_width_height, $iframe, $iframe_eager, $iframe_no_width_height ); 2971 $content_filtered = sprintf( $content, $lazy_img, $lazy_img_xhtml, $lazy_img_html5, $img_eager, $img_no_width_height, $lazy_iframe, $iframe_eager, $iframe_no_width_height);2976 $content_filtered = wp_img_tag_add_decoding_async_attr( sprintf( $content, $lazy_img, $lazy_img_xhtml, $lazy_img_html5, $img_eager, $img_no_width_height, $lazy_iframe, $iframe_eager, $iframe_no_width_height ), 'the_content' ); 2972 2977 2973 2978 // Do not add width, height, srcset, and sizes. 2974 2979 add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' ); … … EOF; 2997 3002 %2$s'; 2998 3003 2999 3004 $content_unfiltered = sprintf( $content, $img, $iframe ); 3000 $content_filtered = sprintf( $content, $lazy_img, $lazy_iframe);3005 $content_filtered = sprintf( $content, wp_img_tag_add_decoding_async_attr( $lazy_img ), $lazy_iframe, 'the_content' ); 3001 3006 3002 3007 // Do not add srcset and sizes while testing. 3003 3008 add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' ); … … EOF; 3015 3020 * @ticket 50756 3016 3021 */ 3017 3022 public function test_wp_filter_content_tags_loading_lazy_opted_out() { 3018 $img = get_image_tag( self::$large_id, '', '', '', 'medium' );3023 $img = wp_img_tag_add_decoding_async_attr( get_image_tag( self::$large_id, '', '', '', 'medium' ), 'the_content' ); 3019 3024 $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>'; 3020 3025 3021 3026 $content = ' … … EOF; 3479 3484 3480 3485 // Following the threshold of 2, the first two content media elements should not be lazy-loaded. 3481 3486 $content_unfiltered = $img1 . $iframe1 . $img2 . $img3 . $iframe2; 3482 $content_expected = $img1 . $iframe1 . $lazy_img2 . $lazy_img3 . $lazy_iframe2;3487 $content_expected = wp_img_tag_add_decoding_async_attr( $img1 . $iframe1 . $lazy_img2 . $lazy_img3 . $lazy_iframe2, 'the_content' ); 3483 3488 3484 3489 $wp_query = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) ); 3485 3490 $wp_the_query = $wp_query; -
tests/phpunit/tests/media/getAdjacentImageLink.php
diff --git tests/phpunit/tests/media/getAdjacentImageLink.php tests/phpunit/tests/media/getAdjacentImageLink.php index 735c0ff15c..1c4133d6e7 100644
class Tests_Media_GetAdjacentImageLink extends WP_Test_Adjacent_Image_Link_TestC 32 32 'when has previous link' => array( 33 33 'current_attachment_index' => 3, 34 34 'expected_attachment_index' => 2, 35 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',35 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 36 36 ), 37 37 'with text when has previous link' => array( 38 38 'current_attachment_index' => 3, … … class Tests_Media_GetAdjacentImageLink extends WP_Test_Adjacent_Image_Link_TestC 43 43 'when has next link' => array( 44 44 'current_attachment_index' => 4, 45 45 'expected_attachment_index' => 5, 46 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',46 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 47 47 'args' => array( 'prev' => false ), 48 48 ), 49 49 'with text when has next link' => array( -
tests/phpunit/tests/media/getNextImageLink.php
diff --git tests/phpunit/tests/media/getNextImageLink.php tests/phpunit/tests/media/getNextImageLink.php index 86a843cbfc..88ee51a434 100644
class Tests_Media_GetNextImageLink extends WP_Test_Adjacent_Image_Link_TestCase 31 31 'when has next link' => array( 32 32 'current_attachment_index' => 4, 33 33 'expected_attachment_index' => 5, 34 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',34 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 35 35 ), 36 36 'with text when has next link' => array( 37 37 'current_attachment_index' => 4, -
tests/phpunit/tests/media/getPreviousImageLink.php
diff --git tests/phpunit/tests/media/getPreviousImageLink.php tests/phpunit/tests/media/getPreviousImageLink.php index 2d2d511e4f..d0eba54295 100644
class Tests_Media_GetPreviousImageLink extends WP_Test_Adjacent_Image_Link_TestC 31 31 'when has previous link' => array( 32 32 'current_attachment_index' => 3, 33 33 'expected_attachment_index' => 2, 34 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',34 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 35 35 ), 36 36 'with text when has previous link' => array( 37 37 'current_attachment_index' => 3, -
tests/phpunit/tests/media/nextImageLink.php
diff --git tests/phpunit/tests/media/nextImageLink.php tests/phpunit/tests/media/nextImageLink.php index 7799779fa8..f6da4605ca 100644
class Tests_Media_NextImageLink extends WP_Test_Adjacent_Image_Link_TestCase { 30 30 'when has next link' => array( 31 31 'current_attachment_index' => 4, 32 32 'expected_attachment_index' => 5, 33 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',33 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image5.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 34 34 ), 35 35 'with text when has next link' => array( 36 36 'current_attachment_index' => 4, -
tests/phpunit/tests/media/previousImageLink.php
diff --git tests/phpunit/tests/media/previousImageLink.php tests/phpunit/tests/media/previousImageLink.php index 11d6583d6a..de422e0379 100644
class Tests_Media_PreviousImageLink extends WP_Test_Adjacent_Image_Link_TestCase 30 30 'when has previous link' => array( 31 31 'current_attachment_index' => 3, 32 32 'expected_attachment_index' => 2, 33 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src=" http://example.org/wp-content/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" /></a>',33 'expected' => '<a href=\'http://example.org/?attachment_id=%%ID%%\'><img width="1" height="1" src="' . WP_CONTENT_URL . '/uploads/image2.jpg" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" decoding="async" /></a>', 34 34 ), 35 35 'with text when has previous link' => array( 36 36 'current_attachment_index' => 3,