Ticket #31053: 31053.diff

src/wp-includes/media.php

@@ -900 +900 @@
 
         $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
-        if ( current_theme_supports( 'html5', 'caption' ) ) {
-                return '<figure ' . $atts['id'] . 'style="width: ' . (int) $atts['width'] . 'px;" class="' . esc_attr( $class ) . '">'
-                . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
-        }
-
-        $caption_width = 10 + $atts['width'];
+        // HTML5 captions never added the extra 10px to the image width
+        $caption_width = current_theme_supports( 'html5', 'caption' ) ? $atts['width'] : 10 + $atts['width'];
 
         /**
          * Filter the width of an image's caption.
@@ -928 +924 @@
         if ( $caption_width )
                 $style = 'style="width: ' . (int) $caption_width . 'px" ';
 
-        return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-        . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+        $html = '';
+        if ( current_theme_supports( 'html5', 'caption' ) ) {
+                $html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+                . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+        } else {
+                $html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+                . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+        }
+
+        return $html;
 }
 
 add_shortcode('gallery', 'gallery_shortcode');