<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42440] trunk: Accessibility: use `aria-current` for the paginated post links output by `wp_link_pages()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42440">42440</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42440","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-12 20:16:56 +0000 (Fri, 12 Jan 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Accessibility: use `aria-current` for the paginated post links output by `wp_link_pages()`.
Continues the introduction in core of the aria-current attribute after <a href="https://core.trac.wordpress.org/changeset/41683">[41683]</a>, <a href="https://core.trac.wordpress.org/changeset/41359">[41359]</a>, and <a href="https://core.trac.wordpress.org/changeset/41371">[41371]</a>.
- changes the `wp_link_pages()` (see the `nextpage` quicktag) output to use an `aria-current` attribute on the current item
- adds `post-nav-links` and `post-page-numbers` CSS classes to help themes style these links
- updates the related tests
Props antonioeatgoat, alexstine.
Fixes <a href="https://core.trac.wordpress.org/ticket/41859">#41859</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2018-01-12 20:12:11 UTC (rev 42439)
+++ trunk/src/wp-includes/post-template.php 2018-01-12 20:16:56 UTC (rev 42440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,6 +862,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Quicktag one or more times). This tag must be within The Loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Added the `aria_current` argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $page
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $numpages
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,6 +878,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Also prepended to the current item, which is not linked. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $link_after HTML or text to append to each Pages link inside the `<a>` tag.
</span><span class="cx" style="display: block; padding: 0 10px"> * Also appended to the current item, which is not linked. Default empty.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $aria_current The value for the aria-current attribute. Possible values are 'page',
+ * 'step', 'location', 'date', 'time', 'true', 'false'. Default is 'page'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $next_or_number Indicates whether page numbers should be used. Valid values are number
</span><span class="cx" style="display: block; padding: 0 10px"> * and next. Default is 'number'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $separator Text between pagination links. Default is ' '.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,10 +896,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $page, $numpages, $multipage, $more;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<p>' . __( 'Pages:' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<p class="post-nav-links">' . __( 'Pages:' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'aria_current' => 'page',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'next_or_number' => 'number',
</span><span class="cx" style="display: block; padding: 0 10px"> 'separator' => ' ',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nextpagelink' => __( 'Next page' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,6 +928,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $i != $page || ! $more && 1 == $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = _wp_link_page( $i ) . $link . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $i === $page ) {
+ $link = '<span class="post-page-numbers current" aria-current="' . esc_attr( $r['aria_current'] ) . '">' . $link . '</span>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the HTML output of individual page number links.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,7 +1023,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_preview_post_link( $post, $query_args, $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '<a href="' . esc_url( $url ) . '">';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return '<a href="' . esc_url( $url ) . '" class="post-page-numbers">';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span></span></pre></div>
<a id="trunktestsphpunittestsposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php 2018-01-12 20:12:11 UTC (rev 42439)
+++ trunk/tests/phpunit/tests/post/template.php 2018-01-12 20:16:56 UTC (rev 42440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,16 +14,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( get_post( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $permalink = sprintf( '<a href="%s">', get_permalink() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $permalink = sprintf( '<a href="%s" class="post-page-numbers">', get_permalink() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page2 = _wp_link_page( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $page3 = _wp_link_page( 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<p>Pages: 1 {$page2}2</a> {$page3}3</a></p>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = '<p class="post-nav-links">Pages: <span class="post-page-numbers current" aria-current="page">1</span> ' . $page2 . '2</a> ' . $page3 . '3</a></p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages( array( 'echo' => 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before_after = " 1 {$page2}2</a> {$page3}3</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before_after = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> {$page2}2</a> {$page3}3</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $before_after, $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $separator = " 1{$page2}2</a>{$page3}3</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $separator = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span>{$page2}2</a>{$page3}3</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $separator, $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = " <em>1</em>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = " <span class=\"post-page-numbers current\" aria-current=\"page\"><em>1</em></span>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $next_prev_link, $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['page'] = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $separator = "<p>Pages: 1 | {$page2}2</a> | {$page3}3</a></p>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $separator = "<p class=\"post-nav-links\">Pages: <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> | {$page2}2</a> | {$page3}3</a></p>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $separator, $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pagelink = " Page 1 | {$page2}Page 2</a> | {$page3}Page 3</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pagelink = " <span class=\"post-page-numbers current\" aria-current=\"page\">Page 1</span> | {$page2}Page 2</a> | {$page3}Page 3</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = wp_link_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span></span></pre>
</div>
</div>
</body>
</html>