WordPress.org

Make WordPress Core

Ticket #35045: 35045.4.diff

File 35045.4.diff, 5.2 KB (added by joemcgill, 5 years ago)

Move src match to wp_calculate_image_srcset()

  • src/wp-includes/media.php

    diff --git src/wp-includes/media.php src/wp-includes/media.php
    index 89b88df..0960560 100644
    function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac 
    10041004                return false;
    10051005        }
    10061006
    1007         // Uploads are (or have been) in year/month sub-directories.
    1008         if ( $image_basename !== $image_meta['file'] ) {
    1009                 $dirname = dirname( $image_meta['file'] );
     1007        // Retrieve the uploads sub-directory from the full size image.
     1008        $dirname = dirname( $image_meta['file'] );
    10101009
    1011                 if ( $dirname !== '.' ) {
    1012                         $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
    1013                 }
     1010        // Normalize dirname when uploads aren't organized in sub-directories.
     1011        if ( $dirname == '.' ) {
     1012                $dirname = '';
    10141013        }
    10151014
     1015        $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
     1016
    10161017        $image_baseurl = trailingslashit( $image_baseurl );
    10171018
    10181019        // Calculate the image aspect ratio.
    function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac 
    10381039        // Array to hold URL candidates.
    10391040        $sources = array();
    10401041
     1042        /**
     1043         * To make sure the ID matches our image src, we will check to see if any sizes in our attachment
     1044         * meta match our $image_src. If no mathces are found we don't return a srcset to avoid serving
     1045         * an incorrect image. See #35045.
     1046         */
     1047        $src_matched = false;
     1048
    10411049        /*
    10421050         * Loop through available images. Only use images that are resized
    10431051         * versions of the same edit.
    function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac 
    10541062                        continue;
    10551063                }
    10561064
     1065                // If the file name is part of the `src`, we've confirmed a match.
     1066                if ( false !== strpos( $image_src, trailingslashit( $dirname ) . $image['file'] ) ) {
     1067                        $src_matched = true;
     1068                }
     1069
    10571070                // Calculate the new image ratio.
    10581071                if ( $image['width'] ) {
    10591072                        $image_ratio_compare = $image['height'] / $image['width'];
    function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac 
    10961109        $sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
    10971110
    10981111        // Only return a 'srcset' value if there is more than one source.
    1099         if ( count( $sources ) < 2 ) {
     1112        if ( ! $src_matched || count( $sources ) < 2 ) {
    11001113                return false;
    11011114        }
    11021115
    function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) { 
    12781291                return $image;
    12791292        }
    12801293
    1281         $base_url = trailingslashit( _wp_upload_dir_baseurl() );
    1282         $image_base_url = $base_url;
    1283 
    1284         $dirname = dirname( $image_meta['file'] );
    1285         if ( $dirname !== '.' ) {
    1286                 $image_base_url .= trailingslashit( $dirname );
    1287         }
    1288 
    1289         $all_sizes = wp_list_pluck( $image_meta['sizes'], 'file' );
    1290 
    1291         foreach ( $all_sizes as $key => $file ) {
    1292                 $all_sizes[ $key ] = $image_base_url . $file;
    1293         }
    1294 
    1295         // Add the original image.
    1296         $all_sizes[] = $base_url . $image_meta['file'];
    1297 
    1298         // Bail early if the image src doesn't match any of the known image sizes.
    1299         if ( ! in_array( $image_src, $all_sizes ) ) {
    1300                 return $image;
    1301         }
    1302 
    13031294        $width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
    13041295        $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
    13051296
  • tests/phpunit/tests/media.php

    diff --git tests/phpunit/tests/media.php tests/phpunit/tests/media.php
    index 3da75a0..b9d87c5 100644
    EOF; 
    11331133                // Intermediate sized GIFs should not include the full size in the srcset.
    11341134                $this->assertFalse( strpos( wp_calculate_image_srcset( $size_array, $large_src, $image_meta ), $full_src ) );
    11351135        }
     1136
     1137        /**
     1138         * @ticket 35045
     1139         * @ticket 33641
     1140         */
     1141        function test_wp_make_content_images_responsive_schemes() {
     1142                $image_meta = wp_get_attachment_metadata( self::$large_id );
     1143                $size_array = $this->_get_image_size_array_from_name( 'medium' );
     1144
     1145                $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta ) );
     1146                $sizes  = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, $size_array, $image_meta ) );
     1147
     1148                // Build HTML for the editor.
     1149                $img          = get_image_tag( self::$large_id, '', '', '', 'medium' );
     1150                $img_https    = str_replace( 'http://', 'https://', $img );
     1151                $img_relative = str_replace( 'http://', '//', $img );
     1152
     1153                // Manually add srcset and sizes to the markup from get_image_tag().
     1154                $respimg          = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img );
     1155                $respimg_https    = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_https );
     1156                $respimg_relative = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_relative );
     1157
     1158                $content = '
     1159                        <p>Image, http: protocol. Should have srcset and sizes.</p>
     1160                        %1$s
     1161
     1162                        <p>Image, http: protocol. Should have srcset and sizes.</p>
     1163                        %2$s
     1164
     1165                        <p>Image, protocol-relative. Should have srcset and sizes.</p>
     1166                        %3$s';
     1167
     1168                $unfiltered = sprintf( $content, $img, $img_https, $img_relative );
     1169                $expected   = sprintf( $content, $respimg, $respimg_https, $respimg_relative );
     1170                $actual     = wp_make_content_images_responsive( $unfiltered );
     1171
     1172                $this->assertSame( $expected, $actual );
     1173        }
    11361174}