Skip to content

Commit d8df46a

Browse files
committed
Twenty Ten: 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, denis-de-bernardy, nacin, chriscct7, shreya0shrivastava, sirlouen, sabernhardt, shailu25, westonruter, joedolson. Fixes #10219. git-svn-id: https://develop.svn.wordpress.org/trunk@61097 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 39ca910 commit d8df46a

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

src/wp-content/themes/twentyten/loop.php

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,24 @@
2020
?>
2121

2222
<?php // Display navigation to next/previous pages when applicable. ?>
23-
<?php if ( $wp_query->max_num_pages > 1 ) : ?>
23+
<?php
24+
if ( $wp_query->max_num_pages > 1 ) :
25+
$is_desc = ( 'DESC' === get_query_var( 'order', 'DESC' ) );
26+
27+
$new_posts_text = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' );
28+
$old_posts_text = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' );
29+
30+
$prev_link = $is_desc ? get_next_posts_link( $old_posts_text ) : get_previous_posts_link( $old_posts_text );
31+
$next_link = $is_desc ? get_previous_posts_link( $new_posts_text ) : get_next_posts_link( $new_posts_text );
32+
?>
2433
<div id="nav-above" class="navigation">
25-
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
26-
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
34+
<?php if ( $prev_link ) : ?>
35+
<div class="nav-previous"><?php echo $prev_link; ?></div>
36+
<?php endif; ?>
37+
38+
<?php if ( $next_link ) : ?>
39+
<div class="nav-next"><?php echo $next_link; ?></div>
40+
<?php endif; ?>
2741
</div><!-- #nav-above -->
2842
<?php endif; ?>
2943

@@ -205,7 +219,12 @@
205219
<?php // Display navigation to next/previous pages when applicable. ?>
206220
<?php if ( $wp_query->max_num_pages > 1 ) : ?>
207221
<div id="nav-below" class="navigation">
208-
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
209-
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
222+
<?php if ( $prev_link ) : ?>
223+
<div class="nav-previous"><?php echo $prev_link; ?></div>
224+
<?php endif; ?>
225+
226+
<?php if ( $next_link ) : ?>
227+
<div class="nav-next"><?php echo $next_link; ?></div>
228+
<?php endif; ?>
210229
</div><!-- #nav-below -->
211230
<?php endif; ?>

0 commit comments

Comments
 (0)