Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.446
diff -u -r1.446 forum.module
--- modules/forum/forum.module	15 Jan 2008 08:16:45 -0000	1.446
+++ modules/forum/forum.module	25 Jan 2008 11:09:53 -0000
@@ -354,24 +354,22 @@
  */
 function forum_form_alter(&$form, $form_state, $form_id) {
   // Hide critical options from forum vocabulary
-  if ($form_id == 'taxonomy_form_vocabulary') {
-    $vid = variable_get('forum_nav_vocabulary', '');
-    if (isset($form['vid']) && $form['vid']['#value'] == $vid) {
-      $form['help_forum_vocab'] = array(
-        '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
-        '#weight' => -1,
-      );
-      $form['content_types']['nodes']['#required'] = TRUE;
-      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
-      $form['settings']['required'] = array('#type' => 'value', '#value' => FALSE);
-      $form['settings']['relations'] = array('#type' => 'value', '#value' => FALSE);
-      $form['settings']['tags'] = array('#type' => 'value', '#value' => FALSE);
-      $form['settings']['multiple'] = array('#type' => 'value', '#value' => FALSE);
-      unset($form['delete']);
-    }
+  $vid = variable_get('forum_nav_vocabulary', '');
+  if ($form_id == 'taxonomy_form_vocabulary' && isset($form['vid']) && $form['vid']['#value'] == $vid) {
+    $form['help_forum_vocab'] = array(
+      '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
+      '#weight' => -1,
+    );
+    $form['content_types']['nodes']['#required'] = TRUE;
+    $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
+    $form['settings']['required'] = array('#type' => 'value', '#value' => FALSE);
+    $form['settings']['relations'] = array('#type' => 'value', '#value' => FALSE);
+    $form['settings']['tags'] = array('#type' => 'value', '#value' => FALSE);
+    $form['settings']['multiple'] = array('#type' => 'value', '#value' => FALSE);
+    unset($form['delete']);
   }
   // Hide multiple parents select from forum terms.
-  if ($form_id == 'taxonomy_form_term') {
+  if ($form_id == 'taxonomy_form_term' && isset($form['vid']) && $form['vid']['#value'] == $vid) {
     unset($form['advanced']['parent']);
   }
   if ($form_id == 'forum_node_form') {