Changeset 28671 for trunk/src/wp-includes/general-template.php

Timestamp:

06/05/2014 02:09:12 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Avoid an empty href attribute in paginate_links(). Add unit tests.

props obenland, Nessworthy.
fixes #24606.

File:

• trunk/src/wp-includes/general-template.php (modified) (3 diffs)

trunk/src/wp-includes/general-template.php

@@ -2477 +2477 @@
         $page_links = array();
         $dots = false;
+        $base = str_replace( '%_%', $args['format'], $args['base'] );
 
         if ( $args['prev_next'] && $current && 1 < $current ) :
-                $link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
-                $link = str_replace( '%#%', $current - 1, $link );
+                $link = str_replace( '%#%', $current - 1, $base );
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );
@@ -2500 +2500 @@
                 else :
                         if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-                                $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-                                $link = str_replace( '%#%', $n, $link );
+                                $link = str_replace( '%#%', $n, $base );
                                 if ( $add_args )
                                         $link = add_query_arg( $add_args, $link );
@@ -2516 +2515 @@
         endfor;
         if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
-                $link = str_replace( '%_%', $args['format'], $args['base'] );
-                $link = str_replace( '%#%', $current + 1, $link );
+                $link = str_replace( '%#%', $current + 1, $base );
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );