Changeset 15056

Timestamp:

05/29/2010 04:46:46 PM (13 years ago)

Author:

nacin

Message:

Use show_in_nav_menus for attachments. Also add it to register_taxonomy for consistency and have it default to public, not show_ui, like post types. see #13621.

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (4 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -387 +387 @@
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-    $taxonomies = get_taxonomies( array( 'show_ui' => true ), 'object' );
+    $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
     if ( !$taxonomies )
@@ -953 +953 @@
 function _wp_nav_menu_meta_box_object( $object = null ) {
     if ( isset( $object->name ) ) {
-        // don't show media meta box
-        if ( 'attachment' == $object->name )
-            return false;
 
         if ( 'page' == $object->name ) {

trunk/wp-includes/post.php

@@ -51 +51 @@
         'query_var' => false,
         'can_export' => false,
+        'show_in_nav_menus' => false,
     ) );
 

trunk/wp-includes/taxonomy.php

@@ -46 +46 @@
         'show_ui' => false,
         '_builtin' => true,
+        'show_in_nav_menus' => false,
     ) ) ;
 
@@ -233 +234 @@
  * defaults to public.
  *
+ * show_in_nav_menus - true makes this taxonomy available for selection in navigation menus.
+ * Defaults to public.
+ *
  * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
  * defaults to show_ui which defalts to public.
@@ -265 +269 @@
                         'labels' => array(),
                         'capabilities' => array(),
+                        'show_in_nav_menus' => null,
                     );
     $args = wp_parse_args($args, $defaults);
@@ -286 +291 @@
     if ( is_null($args['show_ui']) )
         $args['show_ui'] = $args['public'];
+
+    // Whether to show this type in nav-menus.php. Defaults to the setting for public.
+    if ( null === $args['show_in_nav_menus'] )
+        $args['show_in_nav_menus'] = $args['public'];
 
     if ( is_null($args['show_tagcloud']) )