Skip to content

Commit 6f0cb01

Browse files
committed
Twenty Thirteen: Fix post navigation to respect sort order.
Change the labels on post navigation links when the sort order is changed so the labels accurately reflect the target entries. Previously, if the sort order was reversed, 'Older' or 'Previous' links would navigate to newer entries and 'Newer' or 'Next' links would navigate to older entries. Props jikamens, dancameron, obenland, shrey0shrivastava, sirlouen, sabernhardt, shailu25, westonruter, joedolson. See #10219. git-svn-id: https://develop.svn.wordpress.org/trunk@61094 602fd350-edb4-49c9-b593-d223f7449a82
1 parent ec7a192 commit 6f0cb01

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

src/wp-content/themes/twentythirteen/functions.php

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,17 @@ function twentythirteen_paging_nav() {
494494
if ( $wp_query->max_num_pages < 2 ) {
495495
return;
496496
}
497+
498+
$order = get_query_var( 'order', 'DESC' );
499+
$is_desc = 'DESC' === $order;
500+
501+
$new_posts_text = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen' );
502+
$old_posts_text = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen' );
503+
504+
$prev_link = $is_desc ? get_next_posts_link( $old_posts_text ) : get_previous_posts_link( $old_posts_text );
505+
$next_link = $is_desc ? get_previous_posts_link( $new_posts_text ) : get_next_posts_link( $new_posts_text );
497506
?>
507+
498508
<nav class="navigation paging-navigation">
499509
<h1 class="screen-reader-text">
500510
<?php
@@ -503,14 +513,19 @@ function twentythirteen_paging_nav() {
503513
?>
504514
</h1>
505515
<div class="nav-links">
516+
<?php if ( $prev_link ) : ?>
517+
<div class="nav-previous">
518+
<?php echo $prev_link; ?>
519+
</div>
520+
<?php
521+
endif;
506522

507-
<?php if ( get_next_posts_link() ) : ?>
508-
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen' ) ); ?></div>
509-
<?php endif; ?>
510-
511-
<?php if ( get_previous_posts_link() ) : ?>
512-
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></div>
513-
<?php endif; ?>
523+
if ( $next_link ) :
524+
?>
525+
<div class="nav-next">
526+
<?php echo $next_link; ?>
527+
</div>
528+
<?php endif; ?>
514529

515530
</div><!-- .nav-links -->
516531
</nav><!-- .navigation -->

0 commit comments

Comments
 (0)