Ticket #34430: 34430.8.diff

src/wp-includes/media.php

@@ -895 +895 @@
  * @since 4.4.0
  * @access private
  *
- * @param string $size_name  Image size. Accepts any valid image size name (thumbnail, medium, etc.).
+ * @param string $size_name  Image size. Accepts any valid image size name ('thumbnail', 'medium', etc.).
  * @param array  $image_meta The image meta data.
  * @return array|bool Array of width and height values in pixels (in that order)
  *                    or false if the size doesn't exist.
@@ -921 +921 @@
  *
  * @since 4.4.0
  *
-
  * @param int          $attachment_id Optional. 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'.
@@ -954 +953 @@
         return wp_image_srcset_attr( $sources, $size_array, $image_meta, $attachment_id );
 }
 
-
 /**
  * A helper function to concatenate and filter the 'srcset' attribute value.
  *
@@ -1024 +1022 @@
                 return false;
         }
 
-        // Add full size to the '$img_sizes' array.
+        // Add full size to the '$image_sizes' array.
         $image_sizes['full'] = array(
                 'width'  => $image_meta['width'],
                 'height' => $image_meta['height'],
@@ -1102 +1100 @@
          *
          * @since 4.4.0
          *
-         * @param array        $sources       An array of image URLs and widths.
+         * @param array        $sources       An array of image URLs, descriptors, and values.
          * @param int          $attachment_id Image attachment ID.
          * @param array|string $size          Image size. Image size name, or an 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()'.
-
          */
         return apply_filters( 'wp_calculate_image_srcset', array_values( $sources ), $attachment_id, $size_array, $image_meta );
 }
@@ -1138 +1135 @@
                 }
 
                 if ( is_array( $image_meta ) ) {
-                        $width = _wp_get_image_size_from_meta( $size, $image_meta );
-                        if ( $width ) {
-                                $width = absint( $width[0] );
+                        $size_array = _wp_get_image_size_from_meta( $size, $image_meta );
+                        if ( $size_array ) {
+                                $width = absint( $size_array[0] );
                         }
                 }
         }