? .DS_Store
? includes/.DS_Store
? includes/database/.DS_Store
? sites/all/.DS_Store
? sites/all/modules/.DS_Store
? sites/all/modules/content_browser
? sites/all/modules/devel
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.545
diff -u -p -r1.545 forum.module
--- modules/forum/forum.module	22 Dec 2009 20:38:23 -0000	1.545
+++ modules/forum/forum.module	24 Dec 2009 14:59:31 -0000
@@ -256,18 +256,6 @@ function forum_node_view($node, $build_m
 }
 
 /**
- * Implements hook_node_prepare().
- */
-function forum_node_prepare($node) {
-  if (_forum_node_check_node_type($node)) {
-    if (empty($node->nid)) {
-      // New topic
-      $node->taxonomy_forums[0]['tid'] =  arg(3);
-    }
-  }
-}
-
-/**
  * Implements hook_node_validate().
  *
  * Check in particular that only a "leaf" term in the associated taxonomy.
@@ -578,6 +566,10 @@ function forum_form_alter(&$form, $form_
     // Make the vocabulary required for 'real' forum-nodes.
     $form['taxonomy_forums'][$langcode]['#required'] = TRUE;
     $form['taxonomy_forums'][$langcode]['#multiple'] = FALSE;
+    if (empty($form['taxonomy_forums'][$langcode]['#default_value'])){
+      // If the forum id is available, set it as the default tid for taxonomy_forums.
+      $form['taxonomy_forums'][$langcode]['#default_value'] = is_numeric(arg(3)) ? arg(3) : null;
+    }
   }
 }