Changeset 9831 for trunk/wp-includes/canonical.php

Timestamp:

11/21/2008 05:33:05 PM (16 years ago)

Author:

markjaquith

Message:

Comment Page URL fixes by wnorris. fixes #8297

File:

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

trunk/wp-includes/canonical.php

@@ -166 +166 @@
             }
 
-            $paged_redirect['path'] = trailingslashit( preg_replace('|/index.php/?$|', '/', $paged_redirect['path']) ); // strip off trailing /index.php/
+            $paged_redirect['path'] = user_trailingslashit( preg_replace('|/index.php/?$|', '/', $paged_redirect['path']) ); // strip off trailing /index.php/
             if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($paged_redirect['path'], '/index.php/') === false )
-                $paged_redirect['path'] .= 'index.php/';
-            $paged_redirect['path'] .= $addl_path;
+                $paged_redirect['path'] = trailingslashit($paged_redirect['path']) . 'index.php/';
+            if ( !empty( $addl_path ) )
+                $paged_redirect['path'] = trailingslashit($paged_redirect['path']) . $addl_path;
             $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
             $redirect['path'] = $paged_redirect['path'];