Changeset 14219

Timestamp:

04/24/2010 02:42:30 PM (15 years ago)

Author:

dd32

Message:

Change custom post_type default Rewrite endpoint mask to EP_PERMALINK to ensure comment paging rules are added. Removes redundant/non-usable EP_NONE branch. Fixes #13086

Location:

trunk/wp-includes

Files:

• post.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -800 +800 @@
 
     // 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, 'menu_position' => null, 'menu_icon' => null, 'permalink_epmask' => EP_NONE );
+    $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, 'menu_position' => null, 'menu_icon' => null, 'permalink_epmask' => EP_PERMALINK );
     $args = wp_parse_args($args, $defaults);
     $args = (object) $args;

trunk/wp-includes/rewrite.php

@@ -1400 +1400 @@
 
             //only on pages with comments add ../comment-page-xx/
-            if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask || EP_NONE & $ep_mask )
+            if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask )
                 $rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
             else if ( EP_ROOT & $ep_mask && get_option('page_on_front') )