Ticket #35045: 35045.7.diff

src/wp-includes/media.php

@@ -987 +987 @@
         }
 
         $image_basename = wp_basename( $image_meta['file'] );
-        $image_baseurl = _wp_upload_dir_baseurl();
 
         /*
          * WordPress flattens animated GIFs into one frame when generating intermediate sizes.
@@ -1004 +1003 @@
                 return false;
         }
 
-        // Uploads are (or have been) in year/month sub-directories.
-        if ( $image_basename !== $image_meta['file'] ) {
-                $dirname = dirname( $image_meta['file'] );
+        // Retrieve the uploads sub-directory from the full size image.
+        $dirname = dirname( $image_meta['file'] );
+        $dirname = $dirname === '.' ? '' : trailingslashit( $dirname );
 
-                if ( $dirname !== '.' ) {
-                        $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
-                }
-        }
+        $image_baseurl = _wp_upload_dir_baseurl();
+        $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
 
-        $image_baseurl = trailingslashit( $image_baseurl );
-
         // Calculate the image aspect ratio.
         $image_ratio = $image_height / $image_width;
 
@@ -1038 +1033 @@
         // Array to hold URL candidates.
         $sources = array();
 
+        /**
+         * To make sure the ID matches our image src, we will check to see if any sizes in our attachment
+         * meta match our $image_src. If no mathces are found we don't return a srcset to avoid serving
+         * an incorrect image. See #35045.
+         */
+        $src_matched = false;
+
+        /** 
+         * Filter the image year/month directories that are prepended to the image file name when matching to $image_src. 
+         * 
+         * @since 4.4.1 
+         * 
+         * @param string $dirname       The year/month directories or empty string if not used. 
+         * @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 or 0. 
+         */ 
+        $dirname_match = apply_filters( 'wp_calculate_image_srcset_dirname_match', $dirname, $image_src, $image_meta, $attachment_id );
+
         /*
          * Loop through available images. Only use images that are resized
          * versions of the same edit.
@@ -1044 +1058 @@
          */
         foreach ( $image_sizes as $image ) {
 
+                // If the file name is part of the `src`, we've confirmed a match.
+                if ( ! $src_matched && false !== strpos( $image_src, $dirname_match . $image['file'] ) ) {
+                        $src_matched = true;
+                }
+
                 // Filter out images that are from previous edits.
                 if ( $image_edited && ! strpos( $image['file'], $image_edit_hash[0] ) ) {
                         continue;
@@ -1096 +1115 @@
         $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.
-        if ( count( $sources ) < 2 ) {
+        if ( ! $src_matched || count( $sources ) < 2 ) {
                 return false;
         }
 
@@ -1278 +1297 @@
                 return $image;
         }
 
-        $base_url = trailingslashit( _wp_upload_dir_baseurl() );
-        $image_base_url = $base_url;
-
-        $dirname = dirname( $image_meta['file'] );
-        if ( $dirname !== '.' ) {
-                $image_base_url .= trailingslashit( $dirname );
-        }
-
-        $all_sizes = wp_list_pluck( $image_meta['sizes'], 'file' );
-
-        foreach ( $all_sizes as $key => $file ) {
-                $all_sizes[ $key ] = $image_base_url . $file;
-        }
-
-        // Add the original image.
-        $all_sizes[] = $base_url . $image_meta['file'];
-
-        // Bail early if the image src doesn't match any of the known image sizes.
-        if ( ! in_array( $image_src, $all_sizes ) ) {
-                return $image;
-        }
-
         $width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
         $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
 

tests/phpunit/tests/media.php

@@ -1133 +1133 @@
                 // Intermediate sized GIFs should not include the full size in the srcset.
                 $this->assertFalse( strpos( wp_calculate_image_srcset( $size_array, $large_src, $image_meta ), $full_src ) );
         }
+
+        /**
+         * @ticket 35045
+         * @ticket 33641
+         */
+        function test_wp_make_content_images_responsive_schemes() {
+                $image_meta = wp_get_attachment_metadata( self::$large_id );
+                $size_array = $this->_get_image_size_array_from_name( 'medium' );
+
+                $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta ) );
+                $sizes  = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, $size_array, $image_meta ) );
+
+                // Build HTML for the editor.
+                $img          = get_image_tag( self::$large_id, '', '', '', 'medium' );
+                $img_https    = str_replace( 'http://', 'https://', $img );
+                $img_relative = str_replace( 'http://', '//', $img );
+
+                // Manually add srcset and sizes to the markup from get_image_tag().
+                $respimg          = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img );
+                $respimg_https    = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_https );
+                $respimg_relative = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_relative );
+
+                $content = '
+                        <p>Image, http: protocol. Should have srcset and sizes.</p>
+                        %1$s
+
+                        <p>Image, http: protocol. Should have srcset and sizes.</p>
+                        %2$s
+
+                        <p>Image, protocol-relative. Should have srcset and sizes.</p>
+                        %3$s';
+
+                $unfiltered = sprintf( $content, $img, $img_https, $img_relative );
+                $expected   = sprintf( $content, $respimg, $respimg_https, $respimg_relative );
+                $actual     = wp_make_content_images_responsive( $unfiltered );
+
+                $this->assertSame( $expected, $actual );
+        }
 }