Ticket #27402: 27402.4.patch

wp-includes/media.php

@@ -1056 +1056 @@
 
         $i = 0;
         foreach ( $attachments as $id => $attachment ) {
+                
+                $attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
                 if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
-                        $image_output = wp_get_attachment_link( $id, $atts['size'], false, false );
+                        $image_output = wp_get_attachment_link( $id, $atts['size'], false, false, $attr );
                 } elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) {
-                        $image_output = wp_get_attachment_image( $id, $atts['size'], false );
+                        $image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr );
                 } else {
-                        $image_output = wp_get_attachment_link( $id, $atts['size'], true, false );
+                        $image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
                 }
                 $image_meta  = wp_get_attachment_metadata( $id );
 
@@ -1076 +1078 @@
                         </{$icontag}>";
                 if ( $captiontag && trim($attachment->post_excerpt) ) {
                         $output .= "
-                                <{$captiontag} class='wp-caption-text gallery-caption'>
+                                <{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
                                 " . wptexturize($attachment->post_excerpt) . "
                                 </{$captiontag}>";
                 }

wp-includes/post-template.php

@@ -1462 +1462 @@
  * @param bool $permalink Optional, default is false. Whether to add permalink to image.
  * @param bool $icon Optional, default is false. Whether to include icon.
  * @param string|bool $text Optional, default is false. If string, then will be link text.
+ * @param array|string $attr Optional. Array or string of attributes.
  * @return string HTML content.
  */
-function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) {
+function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
         $id = intval( $id );
         $_post = get_post( $id );
 
@@ -1474 +1475 @@
         if ( $permalink )
                 $url = get_attachment_link( $_post->ID );
 
-        if ( $text )
+        if ( $text ) {
                 $link_text = $text;
-        elseif ( $size && 'none' != $size )
-                $link_text = wp_get_attachment_image( $id, $size, $icon );
-        else
+        } elseif ( $size && 'none' != $size ) {
+                $link_text = wp_get_attachment_image( $id, $size, $icon, $attr );
+        } else {
                 $link_text = '';
+        }
 
         if ( trim( $link_text ) == '' )
                 $link_text = $_post->post_title;