Ticket #27292: 27292.diff

src/wp-includes/media.php

@@ -745 +745 @@
 
         $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
-        return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-        . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+        $html5 = current_theme_supports( 'html5', 'caption' );
+        $itemtag = $html5 ? 'figure' : 'div';
+        $captiontag = $html5 ? 'figcaption' : 'p';
+        
+        return "<$itemtag " . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+        . do_shortcode( $content ) . "<$captiontag " . 'class="wp-caption-text">' . $atts['caption'] . "</$captiontag></$itemtag>";
 }
 
 add_shortcode('gallery', 'gallery_shortcode');

tests/phpunit/tests/media.php

@@ -108 +108 @@
                 $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
         }
 
+        function test_new_img_caption_shortcode_new_format_html5() {
+                add_theme_support( 'html5', array( 'caption' ) );
+                $result = img_caption_shortcode(
+                        array( 'width' => 20 ),
+                        $this->img_content . $this->html_content
+                );
+                $img_preg = preg_quote( $this->img_content );
+                $content_preg = preg_quote( $this->html_content );
+
+                $this->assertEquals( 1, preg_match( "~^<figure [^>]+>{$img_preg}<figcaption [^>]+>{$content_preg}</figcaption></figure>$~", $result ) );
+                remove_theme_support( 'html5' );
+        }
+
         function test_add_remove_oembed_provider() {
                 wp_oembed_add_provider( 'http://foo.bar/*', 'http://foo.bar/oembed' );
                 $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );