<!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>[17519] branches/3.1/wp-includes:
  Correctly handle PATHINFO CPTs and CTs that specify with_front=false.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17519">17519</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-03-10 04:25:40 +0000 (Thu, 10 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Correctly handle PATHINFO CPTs and CTs that specify with_front=false. fixes <a href="http://trac.wordpress.org/ticket/16807">#16807</a> for 3.1</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludeslinktemplatephp">branches/3.1/wp-includes/link-template.php</a></li>
<li><a href="#branches31wpincludespostphp">branches/3.1/wp-includes/post.php</a></li>
<li><a href="#branches31wpincludesrewritephp">branches/3.1/wp-includes/rewrite.php</a></li>
<li><a href="#branches31wpincludesversionphp">branches/3.1/wp-includes/version.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/link-template.php (17518 => 17519)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/link-template.php        2011-03-10 04:24:48 UTC (rev 17518)
+++ branches/3.1/wp-includes/link-template.php        2011-03-10 04:25:40 UTC (rev 17519)
</span><span class="lines">@@ -847,6 +847,8 @@
</span><span class="cx">                 $struct = ( true === $post_type_obj-&gt;has_archive ) ? $post_type_obj-&gt;rewrite['slug'] : $post_type_obj-&gt;has_archive;
</span><span class="cx">                 if ( $post_type_obj-&gt;rewrite['with_front'] )
</span><span class="cx">                         $struct = $wp_rewrite-&gt;front . $struct;
</span><ins>+                else
+                        $struct = $wp_rewrite-&gt;root . $struct;
</ins><span class="cx">                 $link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
</span><span class="cx">         } else {
</span><span class="cx">                 $link = home_url( '?post_type=' . $post_type );
</span></span></pre></div>
<a id="branches31wpincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/post.php (17518 => 17519)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/post.php        2011-03-10 04:24:48 UTC (rev 17518)
+++ branches/3.1/wp-includes/post.php        2011-03-10 04:25:40 UTC (rev 17519)
</span><span class="lines">@@ -987,6 +987,8 @@
</span><span class="cx">                         $archive_slug = $args-&gt;has_archive === true ? $args-&gt;rewrite['slug'] : $args-&gt;has_archive;
</span><span class="cx">                         if ( $args-&gt;rewrite['with_front'] )
</span><span class="cx">                                 $archive_slug = substr( $wp_rewrite-&gt;front, 1 ) . $archive_slug;
</span><ins>+                        else
+                                $archive_slug = $wp_rewrite-&gt;root . $archive_slug;
</ins><span class="cx"> 
</span><span class="cx">                         $wp_rewrite-&gt;add_rule( &quot;{$archive_slug}/?$&quot;, &quot;index.php?post_type=$post_type&quot;, 'top' );
</span><span class="cx">                         if ( $args-&gt;rewrite['feeds'] &amp;&amp; $wp_rewrite-&gt;feeds ) {
</span></span></pre></div>
<a id="branches31wpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/rewrite.php (17518 => 17519)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/rewrite.php        2011-03-10 04:24:48 UTC (rev 17518)
+++ branches/3.1/wp-includes/rewrite.php        2011-03-10 04:25:40 UTC (rev 17519)
</span><span class="lines">@@ -1857,6 +1857,8 @@
</span><span class="cx">         function add_permastruct($name, $struct, $with_front = true, $ep_mask = EP_NONE) {
</span><span class="cx">                 if ( $with_front )
</span><span class="cx">                         $struct = $this-&gt;front . $struct;
</span><ins>+                else
+                        $struct = $this-&gt;root . $struct;
</ins><span class="cx">                 $this-&gt;extra_permastructs[$name] = array($struct, $ep_mask);
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branches31wpincludesversionphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/version.php (17518 => 17519)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/version.php        2011-03-10 04:24:48 UTC (rev 17518)
+++ branches/3.1/wp-includes/version.php        2011-03-10 04:25:40 UTC (rev 17519)
</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 = 17510;
</del><ins>+$wp_db_version = 17516;
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the TinyMCE version
</span></span></pre>
</div>
</div>

</body>
</html>