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

Timestamp:

01/23/2012 07:12:04 PM (13 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/post.php (modified) (4 diffs)

trunk/wp-includes/post.php

@@ -894 +894 @@
  * - labels - An array of labels for this post type. By default post labels are used for non-hierarchical
  *     types and page labels for hierarchical ones. You can see accepted values in {@link get_post_type_labels()}.
- * - permalink_epmask - The default rewrite endpoint bitmasks.
  * - has_archive - True to enable post type archives. Will generate the proper rewrite rules if rewrite is enabled.
  * - rewrite - false to prevent rewrite. Defaults to true. Use array('slug'=>$slug) to customize permastruct;
- *     default will use $post_type as slug. Other options include 'with_front', 'feeds', and 'pages'.
+ *     default will use $post_type as slug. Other options include 'with_front', 'feeds', 'pages', and 'ep_mask'.
  * - query_var - false to prevent queries, or string to value of the query var to use for this post type
  * - can_export - true allows this post type to be exported.
@@ -925 +924 @@
         'supports' => array(), 'register_meta_box_cb' => null,
         'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null,
-        'permalink_epmask' => EP_PERMALINK, 'can_export' => true,
+        'can_export' => true,
         'show_in_nav_menus' => null, 'show_in_menu' => null, 'show_in_admin_bar' => null,
     );
@@ -1000 +999 @@
         if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
             $args->rewrite['feeds'] = (bool) $args->has_archive;
+        if ( ! isset( $args->rewrite['ep_mask'] ) ) {
+            if ( isset( $args['permalink_epmask'] ) )
+                $args->rewrite['ep_mask'] = $args['permalink_epmask'];
+            else
+                $args->rewrite['ep_mask'] = EP_PERMALINK;
+        }
 
         if ( $args->hierarchical )
@@ -1023 +1028 @@
         }
 
-        $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);
+        $wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->rewrite['ep_mask'] );
     }