Ticket #10219: 10219-2.diff

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

@@ -504 +504 @@
 function twentyeleven_content_nav( $html_id ) {
         global $wp_query;
 
-        if ( $wp_query->max_num_pages > 1 ) : ?>
-                <nav id="<?php echo esc_attr( $html_id ); ?>">
-                        <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
-                        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
-                        <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
-                </nav><!-- #nav-above -->
-        <?php endif;
+        // Don't print empty markup if there's only one page.
+        if ( $wp_query->max_num_pages < 2 ) {
+                return;
+        }
+
+        $desc_order = 'DESC' === get_query_var( 'order' );
+        $next_label = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' );
+        $prev_label = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' );
+
+        ?>
+        <nav id="<?php echo esc_attr( $html_id ); ?>">
+                <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
+                <div class="nav-<?php echo $desc_order ? 'previous' : 'next'; ?>"><?php next_posts_link( $desc_order ? $next_label : $prev_label ); ?></div>
+                <div class="nav-<?php echo $desc_order ? 'next' : 'previous'; ?>"><?php previous_posts_link( $desc_order ? $prev_label : $next_label ); ?></div>
+        </nav><!-- #nav-above -->
+        <?php
 }
 endif; // twentyeleven_content_nav
 

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

@@ -259 +259 @@
         global $wp_query;
 
         // Don't print empty markup if there's only one page.
-        if ( $wp_query->max_num_pages < 2 )
+        if ( $wp_query->max_num_pages < 2 ) {
                 return;
+        }
+
+        $desc_order = 'DESC' === get_query_var( 'order' );
+        $next_label = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen' );
+        $prev_label = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen' );
+
         ?>
         <nav class="navigation paging-navigation" role="navigation">
                 <h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
                 <div class="nav-links">
 
                         <?php if ( get_next_posts_link() ) : ?>
-                        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen' ) ); ?></div>
+                                <div class="nav-<?php echo $desc_order ? 'previous' : 'next'; ?>"><?php next_posts_link( $desc_order ? $next_label : $prev_label ); ?></div>
                         <?php endif; ?>
 
                         <?php if ( get_previous_posts_link() ) : ?>
-                        <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></div>
+                                <div class="nav-<?php echo $desc_order ? 'next' : 'previous'; ?>"><?php previous_posts_link( $desc_order ? $prev_label : $next_label ); ?></div>
                         <?php endif; ?>
 
                 </div><!-- .nav-links -->

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

@@ -278 +278 @@
 function twentytwelve_content_nav( $html_id ) {
         global $wp_query;
 
-        if ( $wp_query->max_num_pages > 1 ) : ?>
-                <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
-                        <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
-                        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
-                        <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
-                </nav><!-- .navigation -->
-        <?php endif;
+        // Don't print empty markup if there's only one page.
+        if ( $wp_query->max_num_pages < 2 ) {
+                return;
+        }
+
+        $desc_order = 'DESC' === get_query_var( 'order' );
+        $next_label = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' );
+        $prev_label = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' );
+
+        ?>
+        <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
+                <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
+                <div class="nav-<?php echo $desc_order ? 'previous' : 'next'; ?>"><?php next_posts_link( $desc_order ? $next_label : $prev_label ); ?></div>
+                <div class="nav-<?php echo $desc_order ? 'next' : 'previous'; ?>"><?php previous_posts_link( $desc_order ? $prev_label : $next_label ); ?></div>
+        </nav><!-- .navigation -->
+        <?php
 }
 endif;
 

src/wp-includes/link-template.php

@@ -2428 +2428 @@
 
         // Don't print empty markup if there's only one page.
         if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
+                $desc = 'DESC' === get_query_var( 'order' );
                 $args = wp_parse_args( $args, array(
-                        'prev_text'          => __( 'Older posts' ),
-                        'next_text'          => __( 'Newer posts' ),
+                        'prev_text'          => $desc ? __( 'Older posts' ) : __( 'Newer posts' ),
+                        'next_text'          => $desc ? __( 'Newer posts' ) : __( 'Older posts' ),
                         'screen_reader_text' => __( 'Posts navigation' ),
                 ) );