--- taxonomynode.module	2009-09-20 00:19:27.000000000 +0200
+++ taxonomynodeNew.module	2009-10-10 13:10:12.000000000 +0200
@@ -264,15 +264,25 @@ function taxonomynode_form_alter(&$form,
       $vid = $row->vid;
       if ($vid) {
         $vocab = taxonomy_vocabulary_load($vid);
-        $form['taxonomy'][$vid .'_disabled'] = $form['taxonomy'][$vid];
-        $form['taxonomy'][$vid .'_disabled']['#multiple'] = ($vocab->hierarchy == 2);
-        $form['taxonomy'][$vid .'_disabled']['#disabled'] = TRUE;
-        $form['taxonomy'][$vid .'_disabled']['#tree'] = FALSE;
-        $form['taxonomy'][$vid .'_disabled']['#required'] = FALSE;
-        $form['taxonomy'][$vid] = array(
-          '#type' => 'value',
-          '#value' => $form['taxonomy'][$vid]['#default_value'],
+        $extras = array(
+          '#multiple' => ($vocab->hierarchy == 2),
+          '#disabled' => TRUE,
+          '#tree' => FALSE,
+          '#required' => FALSE,
         );
+        if ($form['taxonomy'][$vid]) {
+          $form['taxonomy'][$vid .'_disabled'] = array_merge($form['taxonomy'][$vid], $extras);
+          $form['taxonomy'][$vid] = array(
+            '#type' => 'value',
+            '#value' => $form['taxonomy'][$vid]['#default_value'],
+          );
+        } elseif ($form['taxonomy']['tags'][$vid]) {
+          $form['taxonomy']['tags'][$vid .'_disabled'] = array_merge($form['taxonomy']['tags'][$vid], $extras);
+          $form['taxonomy']['tags'][$vid] = array(
+            '#type' => 'value',
+            '#value' => $form['taxonomy']['tags'][$vid]['#default_value'],
+          );
+        }
         $form['title_disabled'] = $form['title'];
         $form['title_disabled']['#disabled'] = TRUE;
         $form['title_disabled']['#required'] = FALSE;