Changeset 19738 for trunk/wp-includes/taxonomy.php

Timestamp:

01/23/2012 07:12:04 PM (15 years ago)

Author:

nacin

Message:

Add 'ep_mask' as an argument to the 'rewrite' array for register_post_type() and register_taxonomy(). Keeps 'permalink_epmask' compatible as an argument for post type registrations. Fixes endpoints for category and tag pages. fixes #19275.

File:

• trunk/wp-includes/taxonomy.php (modified) (4 diffs)

trunk/wp-includes/taxonomy.php

@@ -24 +24 @@
                                         'hierarchical' => true,
                                         'slug' => get_option('category_base') ? get_option('category_base') : 'category',
-                                        'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
+                                        'with_front' => ( get_option('category_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true,
+                                        'ep_mask' => EP_CATEGORIES,
+                                ) : false,
                 'public' => true,
                 'show_ui' => true,
@@ -35 +37 @@
                 'rewrite' => did_action( 'init' ) ? array(
                                         'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
-                                        'with_front' => ( get_option('tag_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true ) : false,
+                                        'with_front' => ( get_option('tag_base') && ! $wp_rewrite->using_index_permalinks() ) ? false : true,
+                                        'ep_mask' => EP_TAGS,
+                                ) : false,
                 'public' => true,
                 'show_ui' => true,
@@ -322 +326 @@
                         'slug' => sanitize_title_with_dashes($taxonomy),
                         'with_front' => true,
-                        'hierarchical' => false
+                        'hierarchical' => false,
+                        'ep_mask' => EP_NONE,
                 ));
 
@@ -331 +336 @@
 
                 $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-                $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
+                $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front'], $args['rewrite']['ep_mask'] );
         }