WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Add `aria-describedby` to `img_caption_shortcode()` output to improve image/caption relationship. 

Props joedolson.
Fixes #34595.
Built from https://develop.svn.wordpress.org/trunk@42691


git-svn-id: http://core.svn.wordpress.org/trunk@42519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-02-11 14:44:30 +00:00
parent 8df00f0354
commit 3e19b66f40
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/media.php
View File

@ -1557,9 +1557,12 @@ function img_caption_shortcode( $attr, $content = null ) {
}
if ( ! empty( $atts['id'] ) ) {
$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
$att_id = esc_attr( sanitize_html_class( $atts['id'] ) );
$atts['id'] = 'id="' . $att_id . '" ';
}
$caption_id = 'caption-' . str_replace( '_', '-', $att_id );
$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
$html5 = current_theme_supports( 'html5', 'caption' );
@ -1590,13 +1593,15 @@ function img_caption_shortcode( $attr, $content = null ) {
if ( $html5 ) {
$html = sprintf(
'<figure %s%sclass="%s">%s%s</figure>',
'<figure %s%sclass="%s" aria-describedby="%s">%s%s</figure>',
$atts['id'],
$style,
esc_attr( $class ),
$caption_id,
do_shortcode( $content ),
sprintf(
'<figcaption class="wp-caption-text">%s</figcaption>',
'<figcaption id="%s" class="wp-caption-text">%s</figcaption>',
$caption_id,
$atts['caption']
)
);
@ -1606,9 +1611,10 @@ function img_caption_shortcode( $attr, $content = null ) {
$atts['id'],
$style,
esc_attr( $class ),
do_shortcode( $content ),
str_replace( '<img ', '<img aria-describedby="' . $caption_id . '" ', do_shortcode( $content ) ),
sprintf(
'<p class="wp-caption-text">%s</p>',
'<p id="%s" class="wp-caption-text">%s</p>',
$caption_id,
$atts['caption']
)
);

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-alpha-42690';
$wp_version = '5.0-alpha-42691';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.