Changeset 5017

Timestamp:

03/10/2007 05:54:12 AM (20 years ago)

Author:

markjaquith

Message:

Respect user trailing slash preference for multipage posts and eliminate redundant /1/. fixes #3949

File:

• trunk/wp-includes/post-template.php (modified) (1 diff)

trunk/wp-includes/post-template.php

@@ -156 +156 @@
                                 $output .= ' ';
                                 if ( ($i != $page) || ((!$more) && ($page==1)) ) {
-                                        if ( '' == get_option('permalink_structure') )
-                                                $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
-                                        else
-                                                $output .= '<a href="' . trailingslashit(get_permalink()) . $i . '/">';
+                                        if ( '' == get_option('permalink_structure') ) {
+                                                if ( $i == 1 )
+                                                        $output .= '<a href="' . get_permalink() . $i . '">';
+                                                else
+                                                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
+                                        } else {
+                                                if ( $i == 1 )
+                                                        $output .= '<a href="' . get_permalink() . '">';
+                                                else
+                                                        $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i) . '">';
+                                        }
                                 }
                                 $output .= $j;