Changeset 12993

Timestamp:

02/06/2010 05:27:30 PM (17 years ago)

Author:

ryan

Message:

Add a separate show_ui flag for post types. see #9674

Location:

trunk

Files:

• wp-admin/edit.php (modified) (1 diff)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-includes/post.php (modified) (8 diffs)

trunk/wp-admin/edit.php

@@ -21 +21 @@
 }
 
-if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('_show' => true ) ) ) || in_array( $_GET['post_type'], get_post_types( array('_builtin' => true ) ) ) ) )
+if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) )
         $post_type = $_GET['post_type'];
 else

trunk/wp-admin/menu.php

@@ -82 +82 @@
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
 
-foreach ( (array) get_post_types( array('_show' => true) ) as $ptype ) {
+foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
         $_wp_last_object_menu++;
         $ptype_obj = get_post_type_object($ptype);
-        $menu[$_wp_last_object_menu] = array(esc_attr($ptype_obj->label), 'edit_' . $ptype_obj->capability_type . 's', "edit.php?post_type=$ptype", '', 'menu-top', 'menu-posts', 'div');
+        $menu[$_wp_last_object_menu] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top', 'menu-posts', 'div');
         $submenu["edit.php?post_type=$ptype"][5]  = array( __('Edit'), 'edit_posts',  "edit.php?post_type=$ptype");
         /* translators: add new custom post type */

trunk/wp-admin/post-new.php

@@ -10 +10 @@
 require_once('admin.php');
 
-if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('_show' => true ) ) ) || in_array( $_GET['post_type'], get_post_types( array('_builtin' => true ) ) ) ) )
+if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) )
         $post_type = $_GET['post_type'];
 else

trunk/wp-includes/post.php

@@ -17 +17 @@
 function create_initial_post_types() {
         register_post_type( 'post', array(      'label' => __('Posts'),
-                                                                                'publicly_queryable' => true,
-                                                                                'exclude_from_search' => false,
+                                                                                'public' => true,
+                                                                                'show_ui' => false,
                                                                                 '_builtin' => true,
                                                                                 '_edit_link' => 'post.php?post=%d',
@@ -29 +29 @@
 
         register_post_type( 'page', array(      'label' => __('Pages'),
-                                                                                'publicly_queryable' => true,
-                                                                                'exclude_from_search' => false,
+                                                                                'public' => true,
+                                                                                'show_ui' => false,
                                                                                 '_builtin' => true,
                                                                                 '_edit_link' => 'post.php?post=%d',
@@ -41 +41 @@
 
         register_post_type( 'attachment', array('label' => __('Media'),
-                                                                                        'exclude_from_search' => false,
+                                                                                        'public' => true,
+                                                                                        'show_ui' => false,
                                                                                         '_builtin' => true,
                                                                                         '_edit_link' => 'media.php?attachment_id=%d',
@@ -51 +52 @@
 
         register_post_type( 'revision', array(  'label' => __('Revisions'),
-                                                                                        'exclude_from_search' => true,
+                                                                                        'public' => false,
                                                                                         '_builtin' => true,
                                                                                         '_edit_link' => 'revision.php?revision=%d',
@@ -705 +706 @@
  * exclude_from_search - Whether to exclude posts with this post type from search results. Defaults to true if the type is not public, false if the type is public.
  * publicly_queryable - Whether post_type queries can be performed from the front page.  Defaults to whatever public is set as.
+ * show_ui - Whether to generate a default UI for managing this post type. Defaults to true if the type is public, false if the type is not public.
  * inherit_type - The post type from which to inherit the edit link and capability type. Defaults to none.
  * capability_type - The post type to use for checking read, edit, and delete capabilities. Defaults to "post".
@@ -733 +735 @@
 
         // Args prefixed with an underscore are reserved for internal use.
-        $defaults = array('label' => false, 'publicly_queryable' => null, 'exclude_from_search' => null, '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'capability_type' => 'post', 'hierarchical' => false, 'public' => false, '_show' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null, 'taxonomies' => array() );
+        $defaults = array('label' => false, '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 );
         $args = wp_parse_args($args, $defaults);
         $args = (object) $args;
@@ -743 +745 @@
         if ( null === $args->publicly_queryable )
                 $args->publicly_queryable = $args->public;
+
+        // If not set, default to the setting for public.
+        if ( null === $args->show_ui )
+                $args->show_ui = $args->public;
 
         // If not set, default to true if not public, false if public.
@@ -765 +771 @@
         if ( empty($args->delete_cap) )
                 $args->delete_cap = 'delete_' . $args->capability_type;
-
-        if ( !$args->_builtin && $args->public )
-                $args->_show = true;
 
         if ( ! empty($args->supports) ) {