<!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>[14219] trunk/wp-includes:
Change custom post_type default Rewrite endpoint mask to EP_PERMALINK to ensure comment paging rules are added
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14219">14219</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-24 14:42:30 +0000 (Sat, 24 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change custom post_type default Rewrite endpoint mask to EP_PERMALINK to ensure comment paging rules are added. Removes redundant/non-usable EP_NONE branch. Fixes <a href="http://trac.wordpress.org/ticket/13086">#13086</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.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 (14218 => 14219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-04-24 10:29:01 UTC (rev 14218)
+++ trunk/wp-includes/post.php 2010-04-24 14:42:30 UTC (rev 14219)
</span><span class="lines">@@ -799,7 +799,7 @@
</span><span class="cx"> $wp_post_types = array();
</span><span class="cx">
</span><span class="cx"> // Args prefixed with an underscore are reserved for internal use.
</span><del>- $defaults = array('label' => false, 'singular_label' => false, 'description' => '', 'publicly_queryable' => null, 'exclude_from_search' => null, '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'capability_type' => 'post', 'hierarchical' => false, 'public' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null, 'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null, 'permalink_epmask' => EP_NONE );
</del><ins>+ $defaults = array('label' => false, 'singular_label' => false, 'description' => '', 'publicly_queryable' => null, 'exclude_from_search' => null, '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'capability_type' => 'post', 'hierarchical' => false, 'public' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null, 'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null, 'permalink_epmask' => EP_PERMALINK );
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args = (object) $args;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (14218 => 14219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-04-24 10:29:01 UTC (rev 14218)
+++ trunk/wp-includes/rewrite.php 2010-04-24 14:42:30 UTC (rev 14219)
</span><span class="lines">@@ -1399,7 +1399,7 @@
</span><span class="cx"> $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
</span><span class="cx">
</span><span class="cx"> //only on pages with comments add ../comment-page-xx/
</span><del>- if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask || EP_NONE & $ep_mask )
</del><ins>+ if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask )
</ins><span class="cx"> $rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
</span><span class="cx"> else if ( EP_ROOT & $ep_mask && get_option('page_on_front') )
</span><span class="cx"> $rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
</span></span></pre>
</div>
</div>
</body>
</html>