Ticket #29808: 29808.8.diff

src/wp-includes/link-template.php

@@ -2192 +2192 @@
  * @param array $args {
  *     Optional. Default post navigation arguments.
  *
- *     @type string $prev_text Anchor text to display in the previous post link.
- *                             Default: `<span class="meta-nav">&larr;</span> %title`.
- *     @type string $next_text Anchor text to display in the next post link.
- *                             Default: `%title <span class="meta-nav">&rarr;</span>`.
+ *     @type string $prev_text Anchor text to display in the previous post link. Default: `%title`.
+ *     @type string $next_text Anchor text to display in the next post link. Default: `%title`.
  * }
  * @return string Markup for post links.
  */
 function get_the_post_navigation( $args = array() ) {
         $args = wp_parse_args( $args, array(
-                'prev_text' => _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link' ),
-                'next_text' => _x( '%title <span class="meta-nav">&rarr;</span>', 'Next post link' ),
+                'prev_text' => '%title',
+                'next_text' => '%title',
         ) );
 
         $navigation = '';
@@ -2210 +2208 @@
         $next       = get_next_post_link( '<div class="nav-next">%link</div>', $args['next_text'] );
 
         // Only add markup if there's somewhere to navigate to.
-        if ( $next || $previous ) {
-                $navigation = _navigation_markup( $next . $previous, 'post-navigation', __( 'Post navigation' ) );
+        if ( $previous || $next ) {
+                $navigation = _navigation_markup( $previous . $next, 'post-navigation', __( 'Post navigation' ) );
         }
 
         return $navigation;
@@ -2238 +2236 @@
  * @param array $args {
  *     Optional. Default paging navigation arguments.
  *
- *     @type string $prev_text Anchor text to display in the previous posts link.
- *                             Default: `<span class="meta-nav">&larr;</span> Older posts`.
- *     @type string $next_text Anchor text to display in the next posts link.
- *                             Default: `Newer posts <span class="meta-nav">&rarr;</span>`.
+ *     @type string $prev_text Anchor text to display in the previous posts link. Default: `Older posts`.
+ *     @type string $next_text Anchor text to display in the next posts link. Default: `Newer posts`.
  * }
  * @return string Markup for paging links.
  */
@@ -2251 +2247 @@
         // Don't print empty markup if there's only one page.
         if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
                 $args = wp_parse_args( $args, array(
-                        'prev_text' => __( '<span class="meta-nav">&larr;</span> Older posts' ),
-                        'next_text' => __( 'Newer posts <span class="meta-nav">&rarr;</span>' ),
+                        'prev_text' => __( 'Older posts' ),
+                        'next_text' => __( 'Newer posts' ),
                 ) );
 
-                $next_link = get_next_posts_link( $args['prev_text'] );
-                $prev_link = get_previous_posts_link( $args['next_text'] );
+                $next_link = get_previous_posts_link( $args['next_text'] );
+                $prev_link = get_next_posts_link( $args['prev_text'] );
 
-                if ( $next_link ) {
-                        $navigation .= '<div class="nav-previous">' . $next_link . '</div>';
+                if ( $prev_link ) {
+                        $navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
                 }
 
-                if ( $prev_link ) {
-                        $navigation .= '<div class="nav-next">' . $prev_link . '</div>';
+                if ( $next_link ) {
+                        $navigation .= '<div class="nav-next">' . $next_link . '</div>';
                 }
 
                 $navigation = _navigation_markup( $navigation );
@@ -2303 +2299 @@
  *     @type int    $total              The total amount of pages. Default: Value of 'max_num_pages' of current query.
  *     @type int    $current            The current page number. Default: Value of 'paged' query var.
  *     @type bool   $prev_next          Whether to include previous and next links. Default: true.
- *     @type string $prev_text          Anchor text to display in the previous posts link. Default: `&larr; Previous`.
- *     @type string $next_text          Anchor text to display in the next posts link. Default: `Next &rarr;`.
+ *     @type string $prev_text          Anchor text to display in the previous posts link. Default: `Previous`.
+ *     @type string $next_text          Anchor text to display in the next posts link. Default: `Next`.
  *     @type bool   $show_all           Whether to show all pages.
  *                                      Default: false, shows short list of the pages near the current page.
  *     @type int    $end_size           Amount of numbers on either the start and the end list edges. Default: 1.
@@ -2324 +2320 @@
         if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
                 $args = wp_parse_args( $args, array(
                         'mid_size'  => 1,
-                        'prev_text' => __( '&larr; Previous' ),
-                        'next_text' => __( 'Next &rarr;' ),
+                        'prev_text' => __( 'Previous' ),
+                        'next_text' => __( 'Next' ),
                 ) );
                 // Make sure we get plain links, so we can work with it.
                 $args['type'] = 'plain';
@@ -2373 +2369 @@
 
         $template = '
         <nav class="navigation %1$s" role="navigation">
-                <h1 class="screen-reader-text">%2$s</h1>
+                <h2 class="screen-reader-text">%2$s</h2>
                 <div class="nav-links">%3$s</div>
         </nav>';