Ticket #29869: 29869.2.diff

src/wp-includes/media.php

@@ -694 +694 @@
  */
 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);
-                if ( is_array($size) )
-                        $size = join('x', $size);
+                $size_class = $size;
+                if ( is_array( $size_class ) ) {
+                        $size_class = join( 'x', $size_class );
+                }
                 $attachment = get_post($attachment_id);
                 $default_attr = array(
                         'src'   => $src,
-                        'class' => "attachment-$size",
+                        'class' => "attachment-$size_class",
                         'alt'   => trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
                 );
                 if ( empty($default_attr['alt']) )
@@ -719 +722 @@
                  *
                  * @since 2.8.0
                  *
-                 * @param mixed $attr       Attributes for the image markup.
-                 * @param int   $attachment Image attachment post.
+                 * @param mixed        $attr       Attributes for the image markup.
+                 * @param int          $attachment Image attachment post.
+                 * @param string|array $size Requested size.
                  */
-                $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment );
+                $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
                 $attr = array_map( 'esc_attr', $attr );
                 $html = rtrim("<img $hwstring");
                 foreach ( $attr as $name => $value ) {