Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.400
diff -u -p -r1.400 forum.module
--- modules/forum/forum.module	30 May 2007 08:04:38 -0000	1.400
+++ modules/forum/forum.module	1 Jun 2007 11:10:05 -0000
@@ -318,7 +318,7 @@ function forum_block($op = 'list', $delt
  */
 function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
   if ($page) {
-    $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
+    $vocabulary = taxonomy_vocabulary_load(_forum_get_vid());
     // Breadcrumb navigation
     $breadcrumb = array();
     $breadcrumb[] = array('path' => 'forum', 'title' => $vocabulary->name);
@@ -384,7 +384,7 @@ function forum_submit(&$form_values) {
 function forum_validate($node) {
   if ($node->taxonomy) {
     // Extract the node's proper topic ID.
-    $vocabulary = variable_get('forum_nav_vocabulary', '');
+    $vocabulary = _forum_get_vid();
     $containers = variable_get('forum_containers', array());
     foreach ($node->taxonomy as $term) {
       if (db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $term, $vocabulary))) {
@@ -759,7 +759,7 @@ function _forum_format($topic) {
 function forum_get_forums($tid = 0) {
 
   $forums = array();
-  $_forums = taxonomy_get_tree(variable_get('forum_nav_vocabulary', ''), $tid);
+  $_forums = taxonomy_get_tree(_forum_get_vid(), $tid);
 
   if (count($_forums)) {
 
@@ -916,7 +916,7 @@ function theme_forum_display($forums, $t
   global $user;
   // forum list, topics list, topic browser and 'add new topic' link
 
-  $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
+  $vocabulary = taxonomy_vocabulary_load(_forum_get_vid());
   $title = !empty($vocabulary->name) ? $vocabulary->name : '';
 
   // Breadcrumb navigation: