1 files changed, 2 insertions, 5 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 2790f5be7..7e36b4087 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -592,12 +592,9 @@ function forum_form(&$node) {
     $node->taxonomy[] = arg(3);
   }
   else {
-    $node->taxonomy = array($node->tid);
-  }
-
-  if ($node->nid) {
+    $forum_terms = taxonomy_node_get_terms_by_vocabulary(_forum_get_vid(), $node->nid);
     // if editing, give option to leave shadows
-    $shadow = (count(taxonomy_node_get_terms($node->nid)) > 1);
+    $shadow = (count($forum_terms) > 1);
     $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
   }