Ticket #41859: 41859.diff

src/wp-includes/post-template.php

@@ -862 +862 @@
  * Quicktag one or more times). This tag must be within The Loop.
  *
  * @since 1.2.0
+ * @since 5.0.0 Added the `aria_current` argument.
  *
  * @global int $page
  * @global int $numpages
@@ -877 +878 @@
  *                                          Also prepended to the current item, which is not linked. Default empty.
  *     @type string       $link_after       HTML or text to append to each Pages link inside the `<a>` tag.
  *                                          Also appended to the current item, which is not linked. Default empty.
+ *     @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 string       $next_or_number   Indicates whether page numbers should be used. Valid values are number
  *                                          and next. Default is 'number'.
  *     @type string       $separator        Text between pagination links. Default is ' '.
@@ -893 +896 @@
         global $page, $numpages, $multipage, $more;
 
         $defaults = array(
-                'before'           => '<p>' . __( 'Pages:' ),
+                'before'           => '<p class="page-links">' . __( 'Pages:' ),
                 'after'            => '</p>',
                 'link_before'      => '',
                 'link_after'       => '',
+                'aria_current'     => 'page',
                 'next_or_number'   => 'number',
                 'separator'        => ' ',
                 'nextpagelink'     => __( 'Next page' ),
@@ -924 +928 @@
                                 $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
                                 if ( $i != $page || ! $more && 1 == $page ) {
                                         $link = _wp_link_page( $i ) . $link . '</a>';
-                                }
+                                } elseif ( $i == $page ) {
+                                        $link = '<span class="page-link current" aria-current="' . esc_attr( $r['aria_current'] ) . '">' . $link . '</span>';
+                                }
                                 /**
                                  * Filters the HTML output of individual page number links.
                                  *
@@ -1017 +1023 @@
                 $url = get_preview_post_link( $post, $query_args, $url );
         }
 
-        return '<a href="' . esc_url( $url ) . '">';
+        return '<a href="' . esc_url( $url ) . '" class="page-link">';
 }
 
 //

tests/phpunit/tests/post/template.php

@@ -14 +14 @@
 
                 setup_postdata( get_post( $post_id ) );
 
-                $permalink = sprintf( '<a href="%s">', get_permalink() );
+                $permalink = sprintf( '<a href="%s" class="page-link">', get_permalink() );
                 $page2     = _wp_link_page( 2 );
                 $page3     = _wp_link_page( 3 );
 
-                $expected = "<p>Pages: 1 {$page2}2</a> {$page3}3</a></p>";
+                $expected = '<p class="page-links">Pages: <span class="page-link current" aria-current="page">1</span> ' . $page2 . '2</a> ' . $page3 . '3</a></p>';
                 $output   = wp_link_pages( array( 'echo' => 0 ) );
 
                 $this->assertEquals( $expected, $output );
 
-                $before_after = " 1 {$page2}2</a> {$page3}3</a>";
+                $before_after = " <span class=\"page-link current\" aria-current=\"page\">1</span> {$page2}2</a> {$page3}3</a>";
                 $output       = wp_link_pages(
                         array(
                                 'echo'   => 0,
@@ -34 +34 @@
 
                 $this->assertEquals( $before_after, $output );
 
-                $separator = " 1{$page2}2</a>{$page3}3</a>";
+                $separator = " <span class=\"page-link current\" aria-current=\"page\">1</span>{$page2}2</a>{$page3}3</a>";
                 $output    = wp_link_pages(
                         array(
                                 'echo'      => 0,
@@ -46 +46 @@
 
                 $this->assertEquals( $separator, $output );
 
-                $link   = " <em>1</em>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
+                $link   = " <span class=\"page-link current\" aria-current=\"page\"><em>1</em></span>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
                 $output = wp_link_pages(
                         array(
                                 'echo'        => 0,
@@ -107 +107 @@
                 $this->assertEquals( $next_prev_link, $output );
 
                 $GLOBALS['page'] = 1;
-                $separator       = "<p>Pages: 1 | {$page2}2</a> | {$page3}3</a></p>";
+                $separator       = "<p class=\"page-links\">Pages: <span class=\"page-link current\" aria-current=\"page\">1</span> | {$page2}2</a> | {$page3}3</a></p>";
                 $output          = wp_link_pages(
                         array(
                                 'echo'      => 0,
@@ -117 +117 @@
 
                 $this->assertEquals( $separator, $output );
 
-                $pagelink = " Page 1 | {$page2}Page 2</a> | {$page3}Page 3</a>";
+                $pagelink = " <span class=\"page-link current\" aria-current=\"page\">Page 1</span> | {$page2}Page 2</a> | {$page3}Page 3</a>";
                 $output   = wp_link_pages(
                         array(
                                 'echo'      => 0,