<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17512] trunk/wp-includes: Prevent double index.
php preprend on PATHINFO custom taxonomy permalinks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17512">17512</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-03-09 05:18:45 +0000 (Wed, 09 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent double index.php preprend on PATHINFO custom taxonomy permalinks. Proper use of with_front. props greuben. fixes <a href="http://trac.wordpress.org/ticket/16918">#16918</a>. fixes <a href="http://trac.wordpress.org/ticket/16622">#16622</a>. see <a href="http://trac.wordpress.org/ticket/15813">#15813</a>. see <a href="http://trac.wordpress.org/ticket/12659">#12659</a>. For trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (17511 => 17512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-03-08 22:56:43 UTC (rev 17511)
+++ trunk/wp-includes/taxonomy.php 2011-03-09 05:18:45 UTC (rev 17512)
</span><span class="lines">@@ -15,6 +15,8 @@
</span><span class="cx"> * Creates the initial taxonomies when 'init' action is fired.
</span><span class="cx"> */
</span><span class="cx"> function create_initial_taxonomies() {
</span><ins>+ global $wp_rewrite;
+
</ins><span class="cx"> register_taxonomy( 'category', 'post', array(
</span><span class="cx"> 'hierarchical' => true,
</span><span class="cx"> 'update_count_callback' => '_update_post_term_count',
</span><span class="lines">@@ -22,7 +24,7 @@
</span><span class="cx"> 'rewrite' => did_action( 'init' ) ? array(
</span><span class="cx"> 'hierarchical' => true,
</span><span class="cx"> 'slug' => get_option('category_base') ? get_option('category_base') : 'category',
</span><del>- 'with_front' => false) : false,
</del><ins>+ 'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
</ins><span class="cx"> 'public' => true,
</span><span class="cx"> 'show_ui' => true,
</span><span class="cx"> '_builtin' => true,
</span><span class="lines">@@ -34,7 +36,7 @@
</span><span class="cx"> 'query_var' => 'tag',
</span><span class="cx"> 'rewrite' => did_action( 'init' ) ? array(
</span><span class="cx"> 'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
</span><del>- 'with_front' => false) : false,
</del><ins>+ 'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
</ins><span class="cx"> 'public' => true,
</span><span class="cx"> 'show_ui' => true,
</span><span class="cx"> '_builtin' => true,
</span><span class="lines">@@ -329,7 +331,7 @@
</span><span class="cx"> $tag = '([^/]+)';
</span><span class="cx">
</span><span class="cx"> $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
</span><del>- $wp_rewrite->add_permastruct($taxonomy, "{$wp_rewrite->root}{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</del><ins>+ $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( is_null($args['show_ui']) )
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (17511 => 17512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2011-03-08 22:56:43 UTC (rev 17511)
+++ trunk/wp-includes/version.php 2011-03-09 05:18:45 UTC (rev 17512)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 17056;
</del><ins>+$wp_db_version = 17510;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>