From 2aa1dc4038c906f7c33f711f8461a134b922c97b Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Thu, 20 Sep 2007 20:25:43 +0000 Subject: [PATCH] Remove trailing /index.php fixing from canonical.php ... Thanks chaoticmortalcom. fixes #5017 git-svn-id: https://develop.svn.wordpress.org/trunk@6143 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/canonical.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index b88efc49fc..8027a1cb7f 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -18,6 +18,9 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) { if ( false === $original ) return; + // Some PHP setups turn requests for / into /index.php in REQUEST_URI + $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']); + $redirect = $original; $redirect_url = false; @@ -111,8 +114,8 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) { else unset($redirect['port']); - // trailing /index.php or /index.php/ - $redirect['path'] = preg_replace('|/index.php/?$|', '/', $redirect['path']); + // trailing /index.php/ + $redirect['path'] = preg_replace('|/index.php/$|', '/', $redirect['path']); // strip /index.php/ when we're not using PATHINFO permalinks if ( !$wp_rewrite->using_index_permalinks() )