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

Timestamp:

01/18/2013 01:44:22 PM (13 years ago)

Author:

markjaquith

Message:

Consistently use $wp_rewrite->index instead of hardcoding "index.php".

props wonderboymusic. fixes #7337

File:

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

trunk/wp-includes/canonical.php

@@ -273 +273 @@
             }
 
-            $redirect['path'] = user_trailingslashit( preg_replace('|/index.php/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
-            if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/index.php/') === false )
-                $redirect['path'] = trailingslashit($redirect['path']) . 'index.php/';
+            $redirect['path'] = user_trailingslashit( preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
+            if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
+                $redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
             if ( !empty( $addl_path ) )
                 $redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
@@ -325 +325 @@
 
     // trailing /index.php
-    $redirect['path'] = preg_replace('|/index.php/*?$|', '/', $redirect['path']);
+    $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
 
     // Remove trailing spaces from the path
@@ -346 +346 @@
     // strip /index.php/ when we're not using PATHINFO permalinks
     if ( !$wp_rewrite->using_index_permalinks() )
-        $redirect['path'] = str_replace('/index.php/', '/', $redirect['path']);
+        $redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
 
     // trailing slashes