Ticket #34430: 34430.10.diff

src/wp-includes/media.php

@@ -930 +930 @@
  *
  * @since 4.4.0
  *
- * @param int          $attachment_id Optional. Image attachment ID.
+ * @param int          $attachment_id Image attachment ID.
  * @param array|string $size          Image size. Accepts any valid image size, or an array of width and height
  *                                    values in pixels (in that order). Default 'medium'.
  * @param array        $image_meta    Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
@@ -941 +941 @@
                 return false;
         }
 
-        if ( ! is_array( $image_meta ) ) {
-                $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
-        }
-
         $image_url = $image[0];
         $size_array = array(
                 absint( $image[1] ),
                 absint( $image[2] )
         );
 
+        if ( empty( $image_meta['sizes'] ) ) {
+                $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+
+                if ( ! is_array( $image_meta ) ) {
+                        return false;
+                }
+        }
+
         return wp_calculate_image_srcset( $image_url, $size_array, $image_meta, $attachment_id );
 }
 
@@ -1059 +1063 @@
          *
          * @since 4.4.0
          *
-         * @param array $sources       An array of image URLs and widths.
+         * @param array $sources       An array of sources to include in the 'srcset'. Each source
+         *                             consists of an array containing the URL and the descriptor
+         *                             type and value (default: the image width):
+         *
+         *                             image width => array(
+         *                                 'url'        => string,
+         *                                 'descriptor' => string ('w' or 'x'),
+         *                                 'value'      => integer (width or pixel density)
+         *                             },
+         *
          * @param int   $attachment_id Image attachment ID.
          * @param array $size_array    Array of width and height values in pixels (in that order).
          * @param array $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
@@ -1098 +1111 @@
 function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_id = 0, $image_url = null ) {
         $width = 0;
 
-        if ( is_numeric( $size ) ) {
-                $width = absint( $size );
-        } elseif ( is_array( $size ) ) {
+        if ( is_array( $size ) ) {
                 $width = absint( $size[0] );
         } elseif ( is_string( $size ) ) {
                 if ( ! $image_meta && $attachment_id ) {
-                        $image_meta = wp_get_attachment_metadata( $attachment_id );
+                        $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
                 }
 
                 if ( is_array( $image_meta ) ) {