Ticket #40833: 40833.3.diff

src/wp-includes/general-template.php

@@ -3261 +3261 @@
  * anchor tag.
  *
  * @since 2.1.0
+ * @since 4.9.0 Added the `aria_current` argument.
  *
  * @global WP_Query   $wp_query
  * @global WP_Rewrite $wp_rewrite
@@ -3273 +3274 @@
  *     @type int    $total              The total amount of pages. Default is the value WP_Query's
  *                                      `max_num_pages` or 1.
  *     @type int    $current            The current page number. Default is 'paged' query var or 1.
+ *     @type string $aria_current       The value for the aria-current attribute. Possible values are 'page',
+ *                                      'step', 'location', 'date', 'time', 'true', 'false'. Default is 'page'.
  *     @type bool   $show_all           Whether to show all pages. Default false.
  *     @type int    $end_size           How many numbers on either the start and the end list edges.
  *                                      Default 1.
@@ -3308 +3311 @@
         $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
 
         $defaults = array(
-                'base' => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
-                'format' => $format, // ?page=%#% : %#% is replaced by the page number
-                'total' => $total,
-                'current' => $current,
-                'show_all' => false,
-                'prev_next' => true,
-                'prev_text' => __('« Previous'),
-                'next_text' => __('Next »'),
-                'end_size' => 1,
-                'mid_size' => 2,
-                'type' => 'plain',
-                'add_args' => array(), // array of query args to add
-                'add_fragment' => '',
+                'base'               => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
+                'format'             => $format, // ?page=%#% : %#% is replaced by the page number
+                'total'              => $total,
+                'current'            => $current,
+                'aria_current'       => 'page',
+                'show_all'           => false,
+                'prev_next'          => true,
+                'prev_text'          => __( '« Previous' ),
+                'next_text'          => __( 'Next »' ),
+                'end_size'           => 1,
+                'mid_size'           => 2,
+                'type'               => 'plain',
+                'add_args'           => array(), // array of query args to add
+                'add_fragment'       => '',
                 'before_page_number' => '',
-                'after_page_number' => ''
+                'after_page_number'  => '',
         );
 
         $args = wp_parse_args( $args, $defaults );
@@ -3386 +3390 @@
         endif;
         for ( $n = 1; $n <= $total; $n++ ) :
                 if ( $n == $current ) :
-                        $page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
+                        $page_links[] = "<span aria-current='" . esc_attr( $args['aria_current'] ) . "' class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
                         $dots = true;
                 else :
                         if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :

tests/phpunit/tests/general/paginateLinks.php

@@ -16 +16 @@
                 $page50 = get_pagenum_link( 50 );
 
                 $expected =<<<EXPECTED
-<span class='page-numbers current'>1</span>
+<span aria-current='page' class='page-numbers current'>1</span>
 <a class='page-numbers' href='$page2'>2</a>
 <a class='page-numbers' href='$page3'>3</a>
 <span class="page-numbers dots">&hellip;</span>
@@ -34 +34 @@
                 $page50 = home_url( '/page/50/' );
 
                 $expected =<<<EXPECTED
-<span class='page-numbers current'>1</span>
+<span aria-current='page' class='page-numbers current'>1</span>
 <a class='page-numbers' href='$page2'>2</a>
 <a class='page-numbers' href='$page3'>3</a>
 <span class="page-numbers dots">&hellip;</span>
@@ -54 +54 @@
 
                 $expected =<<<EXPECTED
 <a class='page-numbers' href='$home'>1</a>
-<span class='page-numbers current'>2</span>
+<span aria-current='page' class='page-numbers current'>2</span>
 <a class='page-numbers' href='$page3'>3</a>
 <a class='page-numbers' href='$page4'>4</a>
 <span class="page-numbers dots">&hellip;</span>
@@ -74 +74 @@
                 $expected =<<<EXPECTED
 <a class="prev page-numbers" href="$home">&laquo; Previous</a>
 <a class='page-numbers' href='$home'>1</a>
-<span class='page-numbers current'>2</span>
+<span aria-current='page' class='page-numbers current'>2</span>
 <a class='page-numbers' href='$page3'>3</a>
 <a class='page-numbers' href='$page4'>4</a>
 <span class="page-numbers dots">&hellip;</span>
@@ -299 +299 @@
                         'type'    => 'array',
                 ) );
 
-                $this->assertContains( "<span class='page-numbers current'>3</span>", $links );
+                $this->assertContains( "<span aria-current='page' class='page-numbers current'>3</span>", $links );
         }
 
         /**