Changeset 9203

Timestamp:

10/16/2008 07:17:04 PM (18 years ago)

Author:

markjaquith

Message:

Strip trailing /index.php in Canonical, fixes #5017. fixes #7173.

File:

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

trunk/wp-includes/canonical.php

@@ -55 +55 @@
 
         // Some PHP setups turn requests for / into /index.php in REQUEST_URI
-        $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
+        // See: http://trac.wordpress.org/ticket/5017
+        // See: http://trac.wordpress.org/ticket/7173
+        // Disabled, for now:
+        // $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
 
         $redirect = $original;
@@ -178 +181 @@
                 unset($redirect['port']);
 
-        // trailing /index.php/
-        $redirect['path'] = preg_replace('|/index.php/$|', '/', $redirect['path']);
+        // trailing /index.php
+        $redirect['path'] = preg_replace('|/index.php/*?$|', '/', $redirect['path']);
 
         // Remove trailing spaces from the path