Changeset 13773

Timestamp:

03/20/2010 02:05:32 AM (15 years ago)

Author:

dd32

Message:

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 #12605

Location:

trunk/wp-includes

Files:

• post.php (modified) (2 diffs)
• rewrite.php (modified) (5 diffs)

trunk/wp-includes/post.php

@@ -791 +791 @@
 
     // Args prefixed with an underscore are reserved for internal use.
-    $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 );
+    $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 );
     $args = wp_parse_args($args, $defaults);
     $args = (object) $args;
@@ -856 +856 @@
             $args->rewrite['with_front'] = true;
         $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
-        $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front']);
+        $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);
     }
 

trunk/wp-includes/rewrite.php

@@ -55 +55 @@
  * @param bool $with_front Prepend front base to permalink structure.
  */
-function add_permastruct( $name, $struct, $with_front = true ) {
+function add_permastruct( $name, $struct, $with_front = true, $ep_mask = EP_NONE ) {
     global $wp_rewrite;
-    return $wp_rewrite->add_permastruct( $name, $struct, $with_front );
+    return $wp_rewrite->add_permastruct( $name, $struct, $with_front, $ep_mask );
 }
 
@@ -1084 +1084 @@
 
         if ( isset($this->extra_permastructs[$name]) )
-            return $this->extra_permastructs[$name];
+            return $this->extra_permastructs[$name][0];
 
         return false;
@@ -1360 +1360 @@
                     $ep_mask_specific = EP_DAY;
                     break;
+                default:
+                    $ep_mask_specific = EP_NONE;
             }
 
@@ -1612 +1614 @@
 
         // Extra permastructs
-        foreach ( $this->extra_permastructs as $permastruct )
-            $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
+        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));
+        }
 
         // Put them together.
@@ -1907 +1913 @@
      * @param bool $with_front Prepend front base to permalink structure.
      */
-    function add_permastruct($name, $struct, $with_front = true) {
+    function add_permastruct($name, $struct, $with_front = true, $ep_mask = EP_NONE) {
         if ( $with_front )
             $struct = $this->front . $struct;
-        $this->extra_permastructs[$name] = $struct;
+        $this->extra_permastructs[$name] = array($struct, $ep_mask);
     }