Ticket #35577: 35577.3.diff
File 35577.3.diff, 6.3 KB (added by , 8 years ago) |
---|
-
src/wp-admin/css/nav-menus.css
658 658 .add-menu-item-pagelinks { 659 659 margin: .5em auto; 660 660 text-align: center; 661 word-spacing: -3px; 661 662 } 662 663 664 .add-menu-item-pagelinks .page-numbers { 665 display: inline-block; 666 padding: 0 4px; 667 } 668 663 669 .link-to-original { 664 670 display: block; 665 671 margin: 0 0 15px; -
src/wp-includes/general-template.php
3259 3259 * 3260 3260 * @param string $link The paginated link URL. 3261 3261 */ 3262 $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';3262 $page_links[] = '<a class="prev page-numbers" aria-label="' . __( 'Previous page' ) . '" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>'; 3263 3263 endif; 3264 3264 for ( $n = 1; $n <= $total; $n++ ) : 3265 3265 if ( $n == $current ) : … … 3274 3274 $link .= $args['add_fragment']; 3275 3275 3276 3276 /** This filter is documented in wp-includes/general-template.php */ 3277 $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>"; 3277 $page_links[] = "<a class='page-numbers' aria-label='" . sprintf( __( 'Page %s' ), $n ) . "' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>"; 3278 3278 3279 $dots = true; 3279 3280 elseif ( $dots && ! $args['show_all'] ) : 3280 3281 $page_links[] = '<span class="page-numbers dots">' . __( '…' ) . '</span>'; … … 3290 3291 $link .= $args['add_fragment']; 3291 3292 3292 3293 /** This filter is documented in wp-includes/general-template.php */ 3293 $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';3294 $page_links[] = '<a class="next page-numbers" aria-label="' . __( 'Next page' ) . '" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>'; 3294 3295 endif; 3295 3296 switch ( $args['type'] ) { 3296 3297 case 'array' : -
tests/phpunit/tests/general/paginateLinks.php
17 17 18 18 $expected =<<<EXPECTED 19 19 <span class='page-numbers current'>1</span> 20 <a class='page-numbers' href='$page2'>2</a>21 <a class='page-numbers' href='$page3'>3</a>20 <a class='page-numbers' aria-label='Page 2' href='$page2'>2</a> 21 <a class='page-numbers' aria-label='Page 3' href='$page3'>3</a> 22 22 <span class="page-numbers dots">…</span> 23 <a class='page-numbers' href='$page50'>50</a>24 <a class="next page-numbers" href="$page2">Next »</a>23 <a class='page-numbers' aria-label='Page 50' href='$page50'>50</a> 24 <a class="next page-numbers" aria-label="Next page" href="$page2">Next »</a> 25 25 EXPECTED; 26 26 27 27 $links = paginate_links( array( 'total' => 50 ) ); … … 35 35 36 36 $expected =<<<EXPECTED 37 37 <span class='page-numbers current'>1</span> 38 <a class='page-numbers' href='$page2'>2</a>39 <a class='page-numbers' href='$page3'>3</a>38 <a class='page-numbers' aria-label='Page 2' href='$page2'>2</a> 39 <a class='page-numbers' aria-label='Page 3' href='$page3'>3</a> 40 40 <span class="page-numbers dots">…</span> 41 <a class='page-numbers' href='$page50'>50</a>42 <a class="next page-numbers" href="$page2">Next »</a>41 <a class='page-numbers' aria-label='Page 50' href='$page50'>50</a> 42 <a class="next page-numbers" aria-label="Next page" href="$page2">Next »</a> 43 43 EXPECTED; 44 44 45 45 $links = paginate_links( array( 'total' => 50, 'format' => 'page/%#%/' ) ); … … 53 53 $page50 = get_pagenum_link( 50 ); 54 54 55 55 $expected =<<<EXPECTED 56 <a class='page-numbers' href='$home'>1</a>56 <a class='page-numbers' aria-label='Page 1' href='$home'>1</a> 57 57 <span class='page-numbers current'>2</span> 58 <a class='page-numbers' href='$page3'>3</a>59 <a class='page-numbers' href='$page4'>4</a>58 <a class='page-numbers' aria-label='Page 3' href='$page3'>3</a> 59 <a class='page-numbers' aria-label='Page 4' href='$page4'>4</a> 60 60 <span class="page-numbers dots">…</span> 61 <a class='page-numbers' href='$page50'>50</a>61 <a class='page-numbers' aria-label='Page 50' href='$page50'>50</a> 62 62 EXPECTED; 63 63 64 64 $links = paginate_links( array( 'total' => 50, 'prev_next' => false, 'current' => 2 ) ); … … 72 72 $page50 = get_pagenum_link( 50 ); 73 73 74 74 $expected =<<<EXPECTED 75 <a class="prev page-numbers" href="$home">« Previous</a>76 <a class='page-numbers' href='$home'>1</a>75 <a class="prev page-numbers" aria-label="Previous page" href="$home">« Previous</a> 76 <a class='page-numbers' aria-label='Page 1' href='$home'>1</a> 77 77 <span class='page-numbers current'>2</span> 78 <a class='page-numbers' href='$page3'>3</a>79 <a class='page-numbers' href='$page4'>4</a>78 <a class='page-numbers' aria-label='Page 3' href='$page3'>3</a> 79 <a class='page-numbers' aria-label='Page 4' href='$page4'>4</a> 80 80 <span class="page-numbers dots">…</span> 81 <a class='page-numbers' href='$page50'>50</a>82 <a class="next page-numbers" href="$page3">Next »</a>81 <a class='page-numbers' aria-label='Page 50' href='$page50'>50</a> 82 <a class="next page-numbers" aria-label="Next page" href="$page3">Next »</a> 83 83 EXPECTED; 84 84 85 85 $links = paginate_links( array( 'total' => 50, 'prev_next' => true, 'current' => 2 ) ); … … 138 138 $document = new DOMDocument(); 139 139 $document->preserveWhiteSpace = false; 140 140 141 // The first two links should link to page 1141 // The first two links should Page 1 142 142 foreach ( $expected_attributes as $link_idx => $attributes ) { 143 143 144 144 $document->loadHTML( $links[$link_idx] ); … … 319 319 ) ); 320 320 321 321 $page_2_url = home_url() . '?foo=2'; 322 $this->assertContains( "<a class='page-numbers' href='$page_2_url'>2</a>", $links );322 $this->assertContains( "<a class='page-numbers' aria-label='Page 2' href='$page_2_url'>2</a>", $links ); 323 323 } 324 324 }