Changeset 15936

Timestamp:

10/23/2010 06:29:22 PM (16 years ago)

Author:

nacin

Message:

Move the CPT archive flag outside of the rewrite argument, into its own has_archive. has_archive controls more than just URL rewriting, it also handles whether ?post_type= is treated as a CPT archive. feeds remain in rewrite as ?feed= would work regardless. see #13818.

Location:

trunk/wp-includes

Files:

• post.php (modified) (4 diffs)
• query.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -860 +860 @@
  *     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 - Whether to have a post type archive. 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' and 'feeds'.
@@ -886 +887 @@
                 'capability_type' => 'post', 'capabilities' => array(), 'map_meta_cap' => false,
                 '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'hierarchical' => false,
-                'public' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null,
+                'public' => false, 'rewrite' => true, 'has_archive' => false, '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, 'can_export' => true, 'show_in_nav_menus' => null, 'show_in_menu' => null,
@@ -941 +943 @@
 
         if ( false !== $args->rewrite && '' != get_option('permalink_structure') ) {
-                if ( !is_array($args->rewrite) )
+                if ( ! is_array( $args->rewrite ) )
                         $args->rewrite = array();
-                if ( !isset($args->rewrite['slug']) )
+                if ( ! isset( $args->rewrite['slug'] ) )
                         $args->rewrite['slug'] = $post_type;
-                if ( !isset($args->rewrite['with_front']) )
+                if ( ! isset( $args->rewrite['with_front'] ) )
                         $args->rewrite['with_front'] = true;
-                if ( !isset($args->rewrite['archive']) )
-                        $args->rewrite['archive'] = false;
-                if ( !isset($args->rewrite['feeds']) || !$args->rewrite['archive'] )
-                        $args->rewrite['feeds'] = (bool) $args->rewrite['archive'];
+                if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
+                        $args->rewrite['feeds'] = (bool) $args->has_archive;
 
                 if ( $args->hierarchical )
@@ -957 +957 @@
                         $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
 
-                if ( $args->rewrite['archive'] ) {
-                        $archive_slug = $args->rewrite['archive'] === true ? $args->rewrite['slug'] : $args->rewrite['archive'];
+                if ( $args->has_archive ) {
+                        $archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
                         $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
                         if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {

trunk/wp-includes/query.php

@@ -1335 +1335 @@
                         if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
                                 $post_type_obj = get_post_type_object( $qv['post_type'] );
-                                if ( is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['archive'] )
+                                if ( $post_type_obj->has_archive )
                                         $this->is_post_type_archive = true;
                         }