Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.83 diff -u -r1.83 menu.inc --- includes/menu.inc 11 Aug 2005 12:57:41 -0000 1.83 +++ includes/menu.inc 24 Aug 2005 02:58:59 -0000 @@ -570,7 +570,7 @@ if (isset($menu['visible'][$pid]) && $menu['visible'][$pid]['children']) { foreach ($menu['visible'][$pid]['children'] as $mid) { - $output .= theme('menu_item', $mid, menu_in_active_trail($mid) || ($menu['visible'][$mid]['type'] & MENU_EXPANDED) ? theme('menu_tree', $mid) : '', count($menu['visible'][$mid]['children']) == 0); + $output .= theme('menu_item', $mid, count($menu['visible'][$mid]['children']) == 0 ? 'leaf' : ((menu_in_active_trail($mid) || ($menu['visible'][$mid]['type'] & MENU_EXPANDED)) ? 'expanded' : 'collapsed drop-down'), count($menu['visible'][$mid]['children']) > 0 ? theme('menu_tree', $mid) : ''); } } @@ -582,15 +582,15 @@ * * @param $mid * The menu id of the item. + * @param $class + * A string containing the CSS class. * @param $children * A string containing any rendered child items of this menu. - * @param $leaf - * A boolean indicating whether this menu item is a leaf. * * @ingroup themeable */ -function theme_menu_item($mid, $children = '', $leaf = TRUE) { - return '