Changeset 6143

Timestamp:

09/20/2007 08:25:43 PM (19 years ago)

Author:

markjaquith

Message:

Remove trailing /index.php fixing from canonical.php ... Thanks chaoticmortalcom. fixes #5017

File:

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

trunk/wp-includes/canonical.php

@@ -18 +18 @@
         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;
@@ -112 +115 @@
                 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