<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23305] trunk: Consistently use $wp_rewrite->index instead of hardcoding "index.php".</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23305">23305</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-01-18 13:44:22 +0000 (Fri, 18 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consistently use $wp_rewrite->index instead of hardcoding "index.php".
props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/7337">#7337</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (23304 => 23305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2013-01-18 00:07:39 UTC (rev 23304)
+++ trunk/wp-admin/options-permalink.php 2013-01-18 13:44:22 UTC (rev 23305)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> $suffix = '';
</span><span class="cx"> if ( ! $is_apache && ! $iis7_permalinks )
</span><del>- $suffix = 'index.php/';
</del><ins>+ $suffix = $wp_rewrite->index . '/';
</ins><span class="cx"> ?>
</span><span class="cx"> <p><?php
</span><span class="cx"> /* translators: %s is a placeholder that must come at the start of the URL path. */
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (23304 => 23305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2013-01-18 00:07:39 UTC (rev 23304)
+++ trunk/wp-includes/canonical.php 2013-01-18 13:44:22 UTC (rev 23305)
</span><span class="lines">@@ -272,9 +272,9 @@
</span><span class="cx"> $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $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/';
</del><ins>+ $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 . '/';
</ins><span class="cx"> if ( !empty( $addl_path ) )
</span><span class="cx"> $redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
</span><span class="cx"> $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> unset($redirect['port']);
</span><span class="cx">
</span><span class="cx"> // trailing /index.php
</span><del>- $redirect['path'] = preg_replace('|/index.php/*?$|', '/', $redirect['path']);
</del><ins>+ $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
</ins><span class="cx">
</span><span class="cx"> // Remove trailing spaces from the path
</span><span class="cx"> $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> // strip /index.php/ when we're not using PATHINFO permalinks
</span><span class="cx"> if ( !$wp_rewrite->using_index_permalinks() )
</span><del>- $redirect['path'] = str_replace('/index.php/', '/', $redirect['path']);
</del><ins>+ $redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
</ins><span class="cx">
</span><span class="cx"> // trailing slashes
</span><span class="cx"> if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (23304 => 23305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2013-01-18 00:07:39 UTC (rev 23304)
+++ trunk/wp-includes/link-template.php 2013-01-18 13:44:22 UTC (rev 23305)
</span><span class="lines">@@ -1449,13 +1449,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
</span><del>- $request = preg_replace( '|^index\.php|i', '', $request);
</del><ins>+ $request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
</ins><span class="cx"> $request = ltrim($request, '/');
</span><span class="cx">
</span><span class="cx"> $base = trailingslashit( get_bloginfo( 'url' ) );
</span><span class="cx">
</span><span class="cx"> if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
</span><del>- $base .= 'index.php/';
</del><ins>+ $base .= $wp_rewrite->index . '/';
</ins><span class="cx">
</span><span class="cx"> if ( $pagenum > 1 ) {
</span><span class="cx"> $request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (23304 => 23305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2013-01-18 00:07:39 UTC (rev 23304)
+++ trunk/wp-includes/nav-menu-template.php 2013-01-18 13:44:22 UTC (rev 23305)
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
</span><span class="cx"> $raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
</span><span class="cx"> $item_url = untrailingslashit( $raw_item_url );
</span><del>- $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
</del><ins>+ $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
</ins><span class="cx">
</span><span class="cx"> if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
</span><span class="cx"> $classes[] = 'current-menu-item';
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (23304 => 23305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2013-01-18 00:07:39 UTC (rev 23304)
+++ trunk/wp-includes/rewrite.php 2013-01-18 13:44:22 UTC (rev 23305)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx">
</span><span class="cx"> // Strip 'index.php/' if we're not using path info permalinks
</span><span class="cx"> if ( !$wp_rewrite->using_index_permalinks() )
</span><del>- $url = str_replace('index.php/', '', $url);
</del><ins>+ $url = str_replace( $wp_rewrite->index . '/', '', $url );
</ins><span class="cx">
</span><span class="cx"> if ( false !== strpos($url, home_url()) ) {
</span><span class="cx"> // Chop off http://domain.com
</span></span></pre>
</div>
</div>
</body>
</html>