Ticket #34430: 34430.diff

src/wp-includes/media.php

@@ -881 +881 @@
  * }
  *
  */
-function wp_get_attachment_image_srcset_array( $attachment_id, $size = 'medium' ) {
-        // Get the intermediate size.
-        $image = image_get_intermediate_size( $attachment_id, $size );
-
+function wp_get_attachment_image_srcset_array( $attachment_id, $size = 'medium', $attachment_meta = null, $img_url = null ) {
         // Get the post meta.
-        $img_meta = wp_get_attachment_metadata( $attachment_id );
-        if ( ! is_array( $img_meta ) ) {
+        $img_meta = ( is_array( $attachment_meta ) ) ? $attachment_meta : wp_get_attachment_metadata( $attachment_id );
+        if ( empty( $img_meta['sizes'] ) ) {
                 return false;
         }
 
-        // Extract the height and width from the intermediate or the full size.
-        $img_width  = ( $image ) ? $image['width']  : $img_meta['width'];
-        $img_height = ( $image ) ? $image['height'] : $img_meta['height'];
-
-        // Bail early if the width isn't greater than zero.
-        if ( ! $img_width > 0 ) {
-                return false;
+        // Try using passed in $img_url if we have it.
+        if ( ! $img_url && $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+                $img_url = $image[0];
         }
 
-        // Use the URL from the intermediate size or build the url from the metadata.
-        if ( ! empty( $image['url'] ) ) {
-                $img_url = $image['url'];
+        $img_sizes = $img_meta['sizes'];
+
+        // Get the intermediate size.
+        if ( is_array( $size ) ) {
+                list( $img_width, $img_height ) = $size;
         } else {
-                $uploads_dir = wp_upload_dir();
-                $img_file = ( $image ) ? path_join( dirname( $img_meta['file'] ) , $image['file'] ) : $img_meta['file'];
-                $img_url = $uploads_dir['baseurl'] . '/' . $img_file;
+                $img_width  = ( ! empty( $img_sizes[$size] ) ) ? $img_sizes[$size]['width']  : $img_meta['width'];
+                $img_height = ( ! empty( $img_sizes[$size] ) ) ? $img_sizes[$size]['height'] : $img_meta['height'];
         }
 
-        $img_sizes = $img_meta['sizes'];
+        // Bail early if the width isn't greater than zero.
+        if ( ! $img_width > 0 ) {
+                return false;
+        }
 
         // Add full size to the img_sizes array.
         $img_sizes['full'] = array(
@@ -949 +946 @@
          */
         foreach ( $img_sizes as $img ) {
 
-                // Filter out images that are leftovers from previous renditions.
+                // Filter out images that are leftovers from previous versions.
                 if ( $img_edited && ! strpos( $img['file'], $img_edit_hash[0] ) ) {
                         continue;
                 }
@@ -959 +956 @@
                         continue;
                 }
 
-                $candidate_url = path_join( dirname( $img_url ), $img['file'] );
-
                 // Calculate the new image ratio.
                 if ( $img['width'] ) {
                         $img_ratio_compare = $img['height'] / $img['width'];
@@ -969 +964 @@
                 }
 
                 // If the new ratio differs by less than 0.01, use it.
-                if ( abs( $img_ratio - $img_ratio_compare ) < 0.01 && ! in_array( $candidate_url, $candidates ) ) {
-                        // Add the URL to our list of candidates.
-                        $candidates[] = $candidate_url;
+                if ( abs( $img_ratio - $img_ratio_compare ) < 0.01 && ! in_array( $img['file'], $candidates ) ) {
+                        // Add the image file to our list of candidates.
+                        $candidates[] = $img['file'];
 
                         // Add the url, descriptor, and value to the sources array to be returned.
                         $sources[] = array(
-                                'url'        => $candidate_url,
+                                'url'        => path_join( dirname( $img_url ), $img['file'] ),
                                 'descriptor' => 'w',
                                 'value'      => $img['width'],
                         );
@@ -1005 +1000 @@
  *                                    values in pixels (in that order). Default 'medium'.
  * @return string|bool A 'srcset' value string or false.
  */
-function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium' ) {
-        $srcset_array = wp_get_attachment_image_srcset_array( $attachment_id, $size );
+function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $attachment_meta = null, $img_url = null ) {
+        $srcset_array = wp_get_attachment_image_srcset_array( $attachment_id, $size, $attachment_meta, $img_url );
 
         // Only return a srcset value if there is more than one source.
         if ( count( $srcset_array ) <= 1 ) {
@@ -1091 +1086 @@
         $images = get_media_embedded_in_content( $content, 'img' );
 
         $attachment_ids = array();
+        $match_groups = array();
 
         foreach( $images as $image ) {
                 if ( preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) ) {
-                        $attachment_id = (int) $class_id[1];
-                        if ( $attachment_id ) {
-                                $attachment_ids[] = $attachment_id;
-                        }
+                        $attachment_ids[] = (int) $class_id[1];
+                        $match_groups[] = array(
+                                'id' => (int) $class_id[1],
+                                'html' => $image,
+                        );
                 }
         }
 
@@ -1111 +1108 @@
                 _prime_post_caches( $attachment_ids, false, true );
         }
 
-        foreach( $images as $image ) {
-                $content = str_replace( $image, wp_img_add_srcset_and_sizes( $image ), $content );
+        foreach( $match_groups as $match ) {
+                $post_meta = get_metadata( 'post', $match['id'], '_wp_attachment_metadata', true );
+                $content = str_replace( $match['html'], wp_img_add_srcset_and_sizes( $match['html'], $post_meta ), $content );
         }
 
         return $content;
@@ -1129 +1127 @@
  * @param string $image An HTML 'img' element to be filtered.
  * @return string Converted 'img' element with `srcset` and `sizes` attributes added.
  */
-function wp_img_add_srcset_and_sizes( $image ) {
+function wp_img_add_srcset_and_sizes( $image, $attachment_meta = null ) {
         // Return early if a 'srcset' attribute already exists.
         if ( false !== strpos( $image, ' srcset="' ) ) {
                 return $image;
         }
 
-        // Parse id, size, width, and height from the `img` element.
-        $id     = preg_match( '/wp-image-([0-9]+)/i', $image, $match_id     ) ? (int) $match_id[1]     : false;
-        $size   = preg_match( '/size-([^\s|"]+)/i',   $image, $match_size   ) ? $match_size[1]         : false;
-        $width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : false;
+
+        // Parse src, id, size, width, and height from the `img` element.
+        $src    = preg_match( '/ src="([^"]+)"/',     $image, $match_src   ) ? $match_src[1]         : false;
+        $id     = preg_match( '/wp-image-([0-9]+)/i', $image, $match_id    ) ? (int) $match_id[1]    : false;
+        $size   = preg_match( '/size-([^\s|"]+)/i',   $image, $match_size  ) ? $match_size[1]        : false;
+        $width  = preg_match( '/ width="([0-9]+)"/i', $image, $match_width ) ? (int) $match_width[1] : false;
 
         if ( $id && false === $size ) {
                 $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : false;
@@ -1148 +1148 @@
                 }
         }
 
+        if ( ! is_array( $attachment_meta ) ) {
+                $attachment_meta = wp_get_attachment_metadata( $id );
+        }
         /*
          * If attempts to parse the size value failed, attempt to use the image
          * metadata to match the 'src' against the available sizes for an attachment.
          */
-        if ( ! $size && ! empty( $id ) && is_array( $meta = wp_get_attachment_metadata( $id ) ) ) {
+        if ( ! $size && ! empty( $id ) && $attachment_meta ) {
                 // Parse the image src value from the img element.
                 $src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : false;
 
@@ -1167 +1170 @@
                  */
                 $image_filename = wp_basename( $src );
 
-                if ( $image_filename === basename( $meta['file'] ) ) {
+                if ( $image_filename === basename( $attachment_meta['file'] ) ) {
                         $size = 'full';
                 } else {
-                        foreach( $meta['sizes'] as $image_size => $image_size_data ) {
+                        foreach( $attachment_meta['sizes'] as $image_size => $image_size_data ) {
                                 if ( $image_filename === $image_size_data['file'] ) {
                                         $size = $image_size;
                                         break;
@@ -1181 +1184 @@
         }
 
         // If ID and size exist, try for 'srcset' and 'sizes' and update the markup.
-        if ( $id && $size && ( $srcset = wp_get_attachment_image_srcset( $id, $size ) ) && ( $sizes = wp_get_attachment_image_sizes( $id, $size, $width ) ) ) {
+        if ( $id && $size && ( $srcset = wp_get_attachment_image_srcset( $id, $size, $attachment_meta, $src ) ) && ( $sizes = wp_get_attachment_image_sizes( $id, $size, $width ) ) ) {
                 // Format the srcset and sizes string and escape attributes.
                 $srcset_and_sizes = sprintf( ' srcset="%s" sizes="%s"', esc_attr( $srcset ), esc_attr( $sizes) );