Changeset 42694

Timestamp:

02/11/2018 03:39:20 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Media: After [42693], update HTML4 markup in img_caption_shortcode() to avoid an empty ID attribute as well.

Add a unit test for aria-describedby in img_caption_shortcode().

See #34595.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -1624 +1624 @@
             str_replace( '<img ', '<img ' . $describedby, do_shortcode( $content ) ),
             sprintf(
-                '<p id="%s" class="wp-caption-text">%s</p>',
+                '<p %sclass="wp-caption-text">%s</p>',
                 $atts['caption_id'],
                 $atts['caption']

trunk/tests/phpunit/tests/media.php

@@ -213 +213 @@
         $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
         $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+    }
+
+    /**
+     * @ticket 34595
+     */
+    function test_img_caption_shortcode_has_aria_describedby() {
+        $result = img_caption_shortcode(
+            array(
+                'width' => 20,
+                'id'    => 'myId',
+            ),
+            $this->img_content . $this->html_content
+        );
+
+        $this->assertEquals( 1, preg_match_all( '/aria-describedby="caption-myId"/', $result, $_r ) );
     }