sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@27404 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Helen Hou-Sandi 2014-03-05 04:53:33 +00:00
parent 6beddbe7de
commit 83b61e9400
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/media.php
View File

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