Ticket #14110: wp_get_attachment_image.3.diff

wp/wp-includes/media.php

@@ -621 +621 @@
 }
 
 /**
- * Get an HTML img element representing an image attachment
+ * Gets an HTML image element (img) representing an attachment:
  *
+ * For an image attachment, the image scaled to the specified $size.
+ *
+ * For a non-image attachment, an icon like those shown in the Media Library (only when $icon is true).
+ *
+ * $size can be 'full', 'large', 'medium', 'thumbnail',
+ * or any keyword registered with add_image_size().
+ * Unrecognized keywords are interpreted as 'full' (not scaled).
+ *
  * While $size will accept an array, it is better to register a size with
  * add_image_size() so that a cropped version is generated. It's much more
  * efficient than having to find the closest-sized image and then having the
@@ -633 +641 @@
  * @uses wp_get_attachment_image_src() Gets attachment file URL and dimensions
  * @since 2.5.0
  *
- * @param int $attachment_id Image attachment ID.
- * @param string $size Optional, default is 'thumbnail'.
- * @param bool $icon Optional, default is false. Whether it is an icon.
+ * @param int $attachment_id Attachment ID.
+ * @param string|array $size Keyword or array [width, height]. Ignored for icons. Optional, default is 'thumbnail'.
+ * @param bool $icon Use an icon image. Ignored for image attachments. Optional, default is false.
+ * @param array|string $attr HTML attributes to merge in. Optional.
  * @return string HTML img element or empty string on failure.
  */
 function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
 
-        $html = '';
+        $html  = '';
         $image = wp_get_attachment_image_src($attachment_id, $size, $icon);
+        
         if ( $image ) {
                 list($src, $width, $height) = $image;
-                $hwstring = image_hwstring($width, $height);
+
+                $width  = intval($width);
+                $height = intval($height);
+
                 if ( is_array($size) )
                         $size = join('x', $size);
+                
+                if ( $icon && empty($size) ) {
+                        $size = 'icon';
+                }
+
                 $attachment =& get_post($attachment_id);
                 $default_attr = array(
-                        'src'   => $src,
-                        'class' => "attachment-$size",
-                        'alt'   => trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
-                        'title' => trim(strip_tags( $attachment->post_title )),
-                );
-                if ( empty($default_attr['alt']) )
-                        $default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-                if ( empty($default_attr['alt']) )
-                        $default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+                        // Use the image's Alternative Text field if available…
+                        'alt'    => trim( strip_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ))),
+                        'class'  => "attachment-$size",
+                        'height' => $height,
+                        'src'    => $src,
+                        'title'  => trim( strip_tags( $attachment->post_title )),
+                        'width'  => $width,
+                        );
 
-                $attr = wp_parse_args($attr, $default_attr);
-                $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment );
-                $attr = array_map( 'esc_attr', $attr );
-                $html = rtrim("<img $hwstring");
+                if ( empty($default_attr['alt']) ) {
+                        // otherwise Caption…
+                        $default_attr['alt'] = trim( strip_tags( $attachment->post_excerpt ));
+                }
+ 
+                if ( empty($default_attr['alt']) ) {
+                        // otherwise Title
+                        $default_attr['alt'] = trim( strip_tags( $attachment->post_title ));
+                }
+
+                $attr = wp_parse_args( $attr, $default_attr );
+                $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $icon );
+                
+                if ( !isset( $attr['width'], $attr['height'] )) {
+                        // If dimensions are missing (null) after applying `wp_get_attachment_image_attributes` filter, restore them.
+                        // Plugins can still empty these with ('width' => '', 'height' => '').
+                        $attr['width']  = '';
+                        $attr['height'] = '';
+                }
+                
+                $html = '<img';
+                
                 foreach ( $attr as $name => $value ) {
-                        $html .= " $name=" . '"' . $value . '"';
+                        $html .= sprintf( ' %s="%s"', $name, esc_attr($value) );
                 }
+                
                 $html .= ' />';
         }