Changeset 23305

Timestamp:

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

Author:

markjaquith

Message:

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

props wonderboymusic. fixes #7337

Location:

trunk

Files:

• wp-admin/options-permalink.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (3 diffs)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/nav-menu-template.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (1 diff)

trunk/wp-admin/options-permalink.php

@@ -228 +228 @@
 $suffix = '';
 if ( ! $is_apache && ! $iis7_permalinks )
-    $suffix = 'index.php/';
+    $suffix = $wp_rewrite->index . '/';
 ?>
 <p><?php

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

trunk/wp-includes/link-template.php

@@ -1450 +1450 @@
 
         $request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-        $request = preg_replace( '|^index\.php|i', '', $request);
+        $request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
         $request = ltrim($request, '/');
 
@@ -1456 +1456 @@
 
         if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-            $base .= 'index.php/';
+            $base .= $wp_rewrite->index . '/';
 
         if ( $pagenum > 1 ) {

trunk/wp-includes/nav-menu-template.php

@@ -368 +368 @@
             $raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
             $item_url = untrailingslashit( $raw_item_url );
-            $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
+            $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
             if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {

trunk/wp-includes/rewrite.php

@@ -316 +316 @@
     // Strip 'index.php/' if we're not using path info permalinks
     if ( !$wp_rewrite->using_index_permalinks() )
-        $url = str_replace('index.php/', '', $url);
+        $url = str_replace( $wp_rewrite->index . '/', '', $url );
 
     if ( false !== strpos($url, home_url()) ) {