Changeset 12694 for trunk/wp-admin/menu.php

Timestamp:

01/11/2010 07:27:44 PM (17 years ago)

Author:

ryan

Message:

Show custom hierarchical taxonomies in the menus. Props dd32. see #11838

File:

• trunk/wp-admin/menu.php (modified) (2 diffs)

trunk/wp-admin/menu.php

@@ -48 +48 @@
         $i = 15;
         foreach ( $wp_taxonomies as $tax ) {
-                if ( $tax->hierarchical || ! in_array('post', (array) $tax->object_type, true) )
+                if ( ! in_array('post', (array) $tax->object_type, true) )
                         continue;
 
-                $submenu['edit.php'][$i] = array( esc_attr($tax->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name );
+                if ( $tax->hierarchical )
+                        $submenu['edit.php'][$i] = array( esc_attr($tax->label), 'manage_categories', 'categories.php?taxonomy=' . $tax->name );
+                else
+                        $submenu['edit.php'][$i] = array( esc_attr($tax->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name );
                 ++$i;
         }
-
-        $submenu['edit.php'][50] = array( __('Categories'), 'manage_categories', 'categories.php' );
 
 $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top', 'menu-media', 'div' );
@@ -87 +88 @@
         $i = 15;
         foreach ( $wp_taxonomies as $tax ) {
-                if ( $tax->hierarchical || ! in_array($ptype, (array) $tax->object_type, true) )
+                if ( ! in_array($ptype, (array) $tax->object_type, true) )
                         continue;
 
-                $submenu["edit.php?post_type=$ptype"][$i] = array( esc_attr($tax->label), 'manage_categories', "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" );
+                if ( $tax->hierarchical )
+                        $submenu["edit.php?post_type=$ptype"][$i] = array( esc_attr($tax->label), 'manage_categories', "categories.php?taxonomy=$tax->name&post_type=$ptype" );
+                else
+                        $submenu["edit.php?post_type=$ptype"][$i] = array( esc_attr($tax->label), 'manage_categories', "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" );
                 ++$i;
         }