--- S_Site/inoc/drupal/modules/taxonomy_menu/taxonomy_menu.module	2004-02-04 09:59:22.375000000 +0100
+++ V_cvs/contributions/modules/taxonomy_menu/taxonomy_menu.module	2004-01-05 08:45:34.500000000 +0100
@@ -20,9 +20,7 @@
       foreach (taxonomy_get_vocabularies() as $vocabulary) {
         if (variable_get("taxonomy_menu_show_" . $vocabulary->vid, 1)) {
           $path = "taxonomy_menu/" . $vocabulary->vid;
-          if(variable_get("taxonomy_menu_display_vocname", 1)) {
-            menu($path, t($vocabulary->name), "taxonomy_menu_page");
-          }
+          menu($path, t($vocabulary->name), "taxonomy_menu_page");
     
           $tree = taxonomy_get_tree($vocabulary->vid);
           $old_depth = -1;
@@ -50,8 +48,6 @@
 function taxonomy_menu_settings() {
   $form .= form_checkbox(t("Display descendants"), "taxonomy_menu_display_descendants", 1, variable_get("taxonomy_menu_display_descendants", 1), t("If checked, then when a term is selected all nodes belonging to subterms are also displayed."));
 
-  $form .= form_checkbox(t("Show vocabulary name"), "taxonomy_menu_display_vocname", 1, variable_get("taxonomy_menu_display_vocname", 1), t("If checked, the name of the vocabulary is the top-most item in the menu. When you use this together with 'Display Descendants' there is no problem. If you have 'Display Descendants' unchecked, you will see an empty page on the first menu level. To prevent this you can uncheck this box too."));
-  
   foreach (taxonomy_get_vocabularies() as $vocabulary) {
     $form .= form_checkbox(t("Show '%vocab' in menu", array("%vocab" => t($vocabulary->name))), "taxonomy_menu_show_" . $vocabulary->vid, 1, variable_get("taxonomy_menu_show_" . $vocabulary->vid, 1));
   }
@@ -72,7 +68,6 @@
     $tree = taxonomy_get_tree(arg(1), $main_tid);
     $tids = array_map("_taxonomy_menu_get_tid_from_term", $tree);
   }
-  else
   $tids[] = $main_tid;
   $taxonomy->operator = "or";
   $taxonomy->tids = $tids;