Ticket #24606: 24606.diff

wp-includes/general-template.php

@@ -2025 +2025 @@
         $page_links = array();
         $n = 0;
         $dots = false;
+        $base = str_replace( '%_%', $format, $base );
 
         if ( $prev_next && $current && 1 < $current ) :
-                $link = str_replace('%_%', 2 == $current ? '' : $format, $base);
-                $link = str_replace('%#%', $current - 1, $link);
+                $link = str_replace('%#%', $current - 1, $base);
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;
@@ -2041 +2041 @@
                         $dots = true;
                 else :
                         if ( $show_all || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-                                $link = str_replace('%_%', 1 == $n ? '' : $format, $base);
-                                $link = str_replace('%#%', $n, $link);
+                                $link = str_replace('%#%', $n, $base);
                                 if ( $add_args )
                                         $link = add_query_arg( $add_args, $link );
                                 $link .= $add_fragment;
@@ -2055 +2054 @@
                 endif;
         endfor;
         if ( $prev_next && $current && ( $current < $total || -1 == $total ) ) :
-                $link = str_replace('%_%', $format, $base);
-                $link = str_replace('%#%', $current + 1, $link);
+                $link = str_replace('%#%', $current + 1, $base);
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;