Changeset 25133

Timestamp:

08/26/2013 10:34:56 PM (11 years ago)

Author:

ocean90

Message:

Introduce show_in_menu for register_taxonomy.

Accepts boolean: true to show, false to hide. If not set, the default is inherited from show_ui.

fixes #20930.

Location:

trunk/src

Files:

• wp-admin/menu.php (modified) (4 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (3 diffs)

trunk/src/wp-admin/menu.php

@@ -54 +54 @@
     $i = 15;
     foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-        if ( ! $tax->show_ui || ! in_array('post', (array) $tax->object_type, true) )
+        if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) )
             continue;
 
@@ -66 +66 @@
     $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
     foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-        if ( ! $tax->show_ui )
+        if ( ! $tax->show_ui || ! $tax->show_in_menu )
             continue;
 
@@ -85 +85 @@
     $i = 15;
     foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-        if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )
+        if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true) )
             continue;
 
@@ -127 +127 @@
     $i = 15;
     foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-        if ( ! $tax->show_ui || ! in_array($ptype, (array) $tax->object_type, true) )
+        if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
             continue;
 

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -548 +548 @@
             $_taxonomy['cap'] = (array) $taxonomy->cap;
 
+        if ( in_array( 'menu', $fields ) )
+            $_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+
         if ( in_array( 'object_type', $fields ) )
             $_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );

trunk/src/wp-includes/taxonomy.php

@@ -281 +281 @@
  * - show_ui -Whether to generate a default UI for managing this taxonomy in the admin.
  *     * If not set, the default is inherited from public.
+ * - show_in_menu - Where to show the taxonomy in the admin menu.
+ *     * If true, the taxonomy is shown as a submenu of the object type menu.
+ *     * If false, no menu is shown.
+ *     * show_ui must be true.
+ *     * If not set, the default is inherited from show_ui.
  * - show_in_nav_menus - Makes this taxonomy available for selection in navigation menus.
  *     * If not set, the default is inherited from public.
@@ -325 +330 @@
         'hierarchical'          => false,
         'show_ui'               => null,
+        'show_in_menu'          => null,
         'show_in_nav_menus'     => null,
         'show_tagcloud'         => null,
@@ -366 +372 @@
     if ( null === $args['show_ui'] )
         $args['show_ui'] = $args['public'];
+
+    // If not set, default to the setting for show_ui.
+    if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
+        $args['show_in_menu' ] = $args['show_ui'];
 
     // If not set, default to the setting for public.