Changeset 35491

Timestamp:

11/03/2015 12:18:07 AM (11 years ago)

Author:

azaozz

Message:

Responsive images:

• More fixes to inline docs.
• Replace the last wp_get_attachment_metadata() with get_post_meta().
• For consistency only accept array or named size in wp_get_attachment_image_sizes().

Props jaspermdegroot.
See #34430.

File:

• trunk/src/wp-includes/media.php (modified) (3 diffs)

trunk/src/wp-includes/media.php

@@ -931 +931 @@
  * @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'.
@@ -1060 +1060 @@
          * @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).
@@ -1099 +1108 @@
         $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 );
                 }