Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.265
diff -u -r1.265 taxonomy.module
--- modules/taxonomy.module	11 Mar 2006 13:47:51 -0000	1.265
+++ modules/taxonomy.module	19 Mar 2006 11:07:49 -0000
@@ -123,13 +123,20 @@
 function taxonomy_overview_vocabularies() {
   $header = array(t('Name'), t('Type'), array('data' => t('Operations'), 'colspan' => '2'));
   $vocabularies = taxonomy_get_vocabularies();
+  //hide 'forum' vocabulary in categories (#28625)
+  $forum_vid = 0;
+  if (module_exist('forum')) {
+    $forum_vid = _forum_get_vid();
+  }
   foreach ($vocabularies as $vocabulary) {
-    $types = array();
-    foreach ($vocabulary->nodes as $type) {
-      $node_type = node_get_name($type);
-      $types[] = $node_type ? $node_type : $type;
+    if ($vocabulary->vid != $forum_vid) {
+      $types = array();
+      foreach ($vocabulary->nodes as $type) {
+        $node_type = node_get_name($type);
+        $types[] = $node_type ? $node_type : $type;
+      }
+      $rows[] = array(check_plain($vocabulary->name), implode(', ', $types), l(t('edit vocabulary'), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t('list terms'), "admin/taxonomy/$vocabulary->vid"));
     }
-    $rows[] = array(check_plain($vocabulary->name), implode(', ', $types), l(t('edit vocabulary'), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t('list terms'), "admin/taxonomy/$vocabulary->vid"));
   }
 
   if (!$rows) {
@@ -198,10 +205,15 @@
     '#maxlength' => 255,
     '#description' => t('Instructions to present to the user when choosing a term.'),
   );
+  //hide 'forum' from node types list (#28625)
+  $node_types = node_get_types();
+  if (module_exist('forum') && isset($node_types['forum'])) {
+    unset($node_types['forum']);
+  }
   $form['nodes'] = array('#type' => 'checkboxes',
     '#title' => t('Types'),
     '#default_value' => $edit['nodes'],
-    '#options' => node_get_types(),
+    '#options' => $node_types,
     '#description' => t('A list of node types you want to associate with this vocabulary.'),
     '#required' => TRUE,
   );