Add a `class` attribute to the caption shortcode to allow for additional classes on the caption container. props rhyswynne, mcadwell. fixes #25295.

Built from https://develop.svn.wordpress.org/trunk@27404


git-svn-id: http://core.svn.wordpress.org/trunk@27251 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2014-03-05 04:54:15 +00:00
parent 7121bb490d
commit 886a8e9549
1 changed files with 6 additions and 2 deletions

View File

@ -673,6 +673,7 @@ add_shortcode('caption', 'img_caption_shortcode');
* 'aligncenter', alignright', 'alignnone'.
* @type int $width The width of the caption, in pixels.
* @type string $caption The caption text.
* @type string $class Additional class name(s) added to the caption container.
* }
* @param string $content Optional. Shortcode content.
* @return string HTML content to display the caption.
@ -708,7 +709,8 @@ function img_caption_shortcode( $attr, $content = null ) {
'id' => '',
'align' => 'alignnone',
'width' => '',
'caption' => ''
'caption' => '',
'class' => '',
), $attr, 'caption' );
$atts['width'] = (int) $atts['width'];
@ -741,7 +743,9 @@ function img_caption_shortcode( $attr, $content = null ) {
if ( $caption_width )
$style = 'style="width: ' . (int) $caption_width . 'px" ';
return '<div ' . $atts['id'] . $style . 'class="wp-caption ' . esc_attr( $atts['align'] ) . '">'
$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>';
}