Changeset 5018

Timestamp:

03/10/2007 06:09:52 AM (18 years ago)

Author:

markjaquith

Message:

Cleaner and more complete fix for [5017]. fixes #3949

File:

• trunk/wp-includes/post-template.php (modified) (2 diffs)

trunk/wp-includes/post-template.php

@@ -156 +156 @@
                 $output .= ' ';
                 if ( ($i != $page) || ((!$more) && ($page==1)) ) {
-                    if ( '' == get_option('permalink_structure') ) {
-                        if ( $i == 1 )
-                            $output .= '<a href="' . get_permalink() . $i . '">';
-                        else
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">';
+                    } else {
+                        if ( '' == get_option('permalink_structure') )
                             $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) . '">';
@@ -178 +175 @@
                 $i = $page - 1;
                 if ( $i && $more ) {
-                    if ( '' == get_option('permalink_structure') )
-                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $previouspagelink . '</a>';
-                    else
-                        $output .= '<a href="' . get_permalink() . $i . '/">'.$previouspagelink.'</a>';
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">' . $previouspagelink . '</a>';
+                    } else {
+                        if ( '' == get_option('permalink_structure') )
+                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $previouspagelink . '</a>';
+                        else
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i) . '">' . $previouspagelink . '</a>';
+                    }
                 }
                 $i = $page + 1;
                 if ( $i <= $numpages && $more ) {
-                    if ( '' == get_option('permalink_structure') )
-                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">'.$nextpagelink.'</a>';
-                    else
-                        $output .= '<a href="' . trailingslashit(get_permalink()) . $i . '/">' . $nextpagelink . '</a>';
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">' . $nextpagelink . '</a>';
+                    } else {
+                        if ( '' == get_option('permalink_structure') )
+                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $nextpagelink . '</a>';
+                        else
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i) . '">' . $nextpagelink . '</a>';
+                    }
                 }
                 $output .= $after;