<!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>[15936] trunk/wp-includes:
Move the CPT archive flag outside of the rewrite argument,
into its own has_archive.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15936">15936</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-23 18:29:22 +0000 (Sat, 23 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the CPT archive flag outside of the rewrite argument, into its own has_archive. has_archive controls more than just URL rewriting, it also handles whether ?post_type= is treated as a CPT archive. feeds remain in rewrite as ?feed= would work regardless. see <a href="http://trac.wordpress.org/ticket/13818">#13818</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15935 => 15936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-23 18:16:41 UTC (rev 15935)
+++ trunk/wp-includes/post.php 2010-10-23 18:29:22 UTC (rev 15936)
</span><span class="lines">@@ -859,6 +859,7 @@
</span><span class="cx"> * - labels - An array of labels for this post type. By default post labels are used for non-hierarchical
</span><span class="cx"> * types and page labels for hierarchical ones. You can see accepted values in {@link get_post_type_labels()}.
</span><span class="cx"> * - permalink_epmask - The default rewrite endpoint bitmasks.
</span><ins>+ * - has_archive - Whether to have a post type archive. Will generate the proper rewrite rules if rewrite is enabled.
</ins><span class="cx"> * - rewrite - false to prevent rewrite. Defaults to true. Use array('slug'=>$slug) to customize permastruct;
</span><span class="cx"> * default will use $post_type as slug. Other options include 'with_front' and 'feeds'.
</span><span class="cx"> * - query_var - false to prevent queries, or string to value of the query var to use for this post type
</span><span class="lines">@@ -885,7 +886,8 @@
</span><span class="cx"> 'labels' => array(), 'description' => '', 'publicly_queryable' => null, 'exclude_from_search' => null,
</span><span class="cx"> 'capability_type' => 'post', 'capabilities' => array(), 'map_meta_cap' => false,
</span><span class="cx"> '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'hierarchical' => false,
</span><del>- 'public' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null,
</del><ins>+ 'public' => false, 'rewrite' => true, 'has_archive' => false, 'query_var' => true,
+ 'supports' => array(), 'register_meta_box_cb' => null,
</ins><span class="cx"> 'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null,
</span><span class="cx"> 'permalink_epmask' => EP_PERMALINK, 'can_export' => true, 'show_in_nav_menus' => null, 'show_in_menu' => null,
</span><span class="cx"> );
</span><span class="lines">@@ -940,24 +942,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( false !== $args->rewrite && '' != get_option('permalink_structure') ) {
</span><del>- if ( !is_array($args->rewrite) )
</del><ins>+ if ( ! is_array( $args->rewrite ) )
</ins><span class="cx"> $args->rewrite = array();
</span><del>- if ( !isset($args->rewrite['slug']) )
</del><ins>+ if ( ! isset( $args->rewrite['slug'] ) )
</ins><span class="cx"> $args->rewrite['slug'] = $post_type;
</span><del>- if ( !isset($args->rewrite['with_front']) )
</del><ins>+ if ( ! isset( $args->rewrite['with_front'] ) )
</ins><span class="cx"> $args->rewrite['with_front'] = true;
</span><del>- if ( !isset($args->rewrite['archive']) )
- $args->rewrite['archive'] = false;
- if ( !isset($args->rewrite['feeds']) || !$args->rewrite['archive'] )
- $args->rewrite['feeds'] = (bool) $args->rewrite['archive'];
</del><ins>+ if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
+ $args->rewrite['feeds'] = (bool) $args->has_archive;
</ins><span class="cx">
</span><span class="cx"> if ( $args->hierarchical )
</span><span class="cx"> $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
</span><span class="cx"> else
</span><span class="cx"> $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
</span><span class="cx">
</span><del>- if ( $args->rewrite['archive'] ) {
- $archive_slug = $args->rewrite['archive'] === true ? $args->rewrite['slug'] : $args->rewrite['archive'];
</del><ins>+ if ( $args->has_archive ) {
+ $archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
</ins><span class="cx"> $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
</span><span class="cx"> if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
</span><span class="cx"> $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15935 => 15936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-23 18:16:41 UTC (rev 15935)
+++ trunk/wp-includes/query.php 2010-10-23 18:29:22 UTC (rev 15936)
</span><span class="lines">@@ -1334,7 +1334,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
</span><span class="cx"> $post_type_obj = get_post_type_object( $qv['post_type'] );
</span><del>- if ( is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['archive'] )
</del><ins>+ if ( $post_type_obj->has_archive )
</ins><span class="cx"> $this->is_post_type_archive = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>