Changeset 42693

Timestamp:

02/11/2018 03:19:58 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Media: Only add aria-describedby in img_caption_shortcode() if a non-empty attachment ID attribute was provided.

See #34595.

File:

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

trunk/src/wp-includes/media.php

@@ -1544 +1544 @@
     $atts = shortcode_atts(
         array(
-            'id'      => '',
-            'align'   => 'alignnone',
-            'width'   => '',
-            'caption' => '',
-            'class'   => '',
+            'id'         => '',
+            'caption_id' => '',
+            'align'      => 'alignnone',
+            'width'      => '',
+            'caption'    => '',
+            'class'      => '',
         ), $attr, 'caption'
     );
@@ -1557 +1558 @@
     }
 
-    $caption_id = '';
-
-    if ( ! empty( $atts['id'] ) ) {
+    if ( $atts['id'] ) {
         $att_id     = esc_attr( sanitize_html_class( $atts['id'] ) );
         $atts['id'] = 'id="' . $att_id . '" ';
-        $caption_id = 'caption-' . str_replace( '_', '-', $att_id );
+
+        if ( ! $atts['caption_id'] ) {
+            $atts['caption_id'] = 'caption-' . str_replace( '_', '-', $att_id );
+        }
+    }
+
+    $describedby = '';
+
+    if ( $atts['caption_id'] ) {
+        $describedby        = 'aria-describedby="' . $atts['caption_id'] . '" ';
+        $atts['caption_id'] = 'id="' . $atts['caption_id'] . '" ';
     }
 
@@ -1595 +1604 @@
     if ( $html5 ) {
         $html = sprintf(
-            '<figure %s%sclass="%s" aria-describedby="%s">%s%s</figure>',
+            '<figure %s%s%sclass="%s">%s%s</figure>',
             $atts['id'],
+            $describedby,
             $style,
             esc_attr( $class ),
-            $caption_id,
             do_shortcode( $content ),
             sprintf(
-                '<figcaption id="%s" class="wp-caption-text">%s</figcaption>',
-                $caption_id,
+                '<figcaption %sclass="wp-caption-text">%s</figcaption>',
+                $atts['caption_id'],
                 $atts['caption']
             )
@@ -1613 +1622 @@
             $style,
             esc_attr( $class ),
-            str_replace( '<img ', '<img aria-describedby="' . $caption_id . '" ', do_shortcode( $content ) ),
+            str_replace( '<img ', '<img ' . $describedby, do_shortcode( $content ) ),
             sprintf(
                 '<p id="%s" class="wp-caption-text">%s</p>',
-                $caption_id,
+                $atts['caption_id'],
                 $atts['caption']
             )