<!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>[13773] trunk/wp-includes:
Allow for a custom Endpoint Mask to be passed to add_endpoint().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13773">13773</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-20 02:05:32 +0000 (Sat, 20 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow for a custom Endpoint Mask to be passed to add_endpoint(). Allows for endpoints to be targeted to specific rewrite rules. Allow custom post_types to specify their Endpoint mask. Allows for post_type's rewrite rules to inherit Post endpoints, or alternatively, allows for add_endpoint() to target specific post_types. Fixes <a href="http://trac.wordpress.org/ticket/12605">#12605</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 (13772 => 13773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-03-20 01:10:01 UTC (rev 13772)
+++ trunk/wp-includes/post.php 2010-03-20 02:05:32 UTC (rev 13773)
</span><span class="lines">@@ -790,7 +790,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 );
</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, 'permalink_epmask' => EP_NONE );
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args = (object) $args;
</span><span class="cx">
</span><span class="lines">@@ -855,7 +855,7 @@
</span><span class="cx"> if ( !isset($args->rewrite['with_front']) )
</span><span class="cx"> $args->rewrite['with_front'] = true;
</span><span class="cx"> $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
</span><del>- $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front']);
</del><ins>+ $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $args->register_meta_box_cb )
</span><span class="lines">@@ -4580,4 +4580,4 @@
</span><span class="cx">
</span><span class="cx"> add_filter('the_preview', '_set_preview');
</span><span class="cx"> }
</span><del>-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (13772 => 13773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-03-20 01:10:01 UTC (rev 13772)
+++ trunk/wp-includes/rewrite.php 2010-03-20 02:05:32 UTC (rev 13773)
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> * @param string $struct Permalink structure.
</span><span class="cx"> * @param bool $with_front Prepend front base to permalink structure.
</span><span class="cx"> */
</span><del>-function add_permastruct( $name, $struct, $with_front = true ) {
</del><ins>+function add_permastruct( $name, $struct, $with_front = true, $ep_mask = EP_NONE ) {
</ins><span class="cx"> global $wp_rewrite;
</span><del>- return $wp_rewrite->add_permastruct( $name, $struct, $with_front );
</del><ins>+ return $wp_rewrite->add_permastruct( $name, $struct, $with_front, $ep_mask );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( isset($this->extra_permastructs[$name]) )
</span><del>- return $this->extra_permastructs[$name];
</del><ins>+ return $this->extra_permastructs[$name][0];
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1359,6 +1359,8 @@
</span><span class="cx"> case '%day%':
</span><span class="cx"> $ep_mask_specific = EP_DAY;
</span><span class="cx"> break;
</span><ins>+ default:
+ $ep_mask_specific = EP_NONE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //create query for /page/xx
</span><span class="lines">@@ -1611,8 +1613,12 @@
</span><span class="cx"> $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
</span><span class="cx">
</span><span class="cx"> // Extra permastructs
</span><del>- foreach ( $this->extra_permastructs as $permastruct )
- $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
</del><ins>+ foreach ( $this->extra_permastructs as $permastruct ) {
+ if ( is_array($permastruct) )
+ $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct[0], $permastruct[1]));
+ else
+ $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
+ }
</ins><span class="cx">
</span><span class="cx"> // Put them together.
</span><span class="cx"> if ( $this->use_verbose_page_rules )
</span><span class="lines">@@ -1906,10 +1912,10 @@
</span><span class="cx"> * @param string $struct Permalink structure.
</span><span class="cx"> * @param bool $with_front Prepend front base to permalink structure.
</span><span class="cx"> */
</span><del>- function add_permastruct($name, $struct, $with_front = true) {
</del><ins>+ function add_permastruct($name, $struct, $with_front = true, $ep_mask = EP_NONE) {
</ins><span class="cx"> if ( $with_front )
</span><span class="cx"> $struct = $this->front . $struct;
</span><del>- $this->extra_permastructs[$name] = $struct;
</del><ins>+ $this->extra_permastructs[$name] = array($struct, $ep_mask);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>