Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.230
diff -u -3 -r1.230 forum.module
--- modules/forum.module	27 Feb 2005 15:40:35 -0000	1.230
+++ modules/forum.module	28 Feb 2005 21:46:55 -0000
@@ -756,30 +756,33 @@
 
   if (count($forums) || count($parents)) {
     $output  = '<div id="forum">';
-    $output .= '<ul>';
-
+    $items = '';
     if (module_exist('tracker')) {
       if ($user->uid) {
-        $output .= ' <li>'. l(t('My forum discussions.'), "tracker/$user->uid") .'</li>';
+        $items .= ' <li>'. l(t('My forum discussions.'), "tracker/$user->uid") .'</li>';
       }
 
-      $output .= ' <li>'. l(t('Active forum discussions.'), 'tracker') .'</li>';
+      $items .= ' <li>'. l(t('Active forum discussions.'), 'tracker') .'</li>';
     }
 
-    if (user_access('create forum topics')) {
-      $output .= '<li>'. l(t('Post new forum topic.'), "node/add/forum/$tid") .'</li>';
-    }
-    else if ($user->uid) {
-      $output .= '<li>'. t('You are not allowed to post a new forum topic.') .'</li>';
-    }
-    else {
-      $output .= '<li>'. t('<a href="%login">Login</a> to post a new forum topic.', array('%login' => url('user/login'))) .'</li>';
+    $containers = variable_get('forum_containers', array());
+    if ($tid && !in_array($tid, $containers)) {
+        if (user_access('create forum topics')) {
+          $items .= '<li>'. l(t('Post new forum topic.'), "node/add/forum/$tid") .'</li>';
+        }
+        else if ($user->uid) {
+          $items .= '<li>'. t('You are not allowed to post a new forum topic.') .'</li>';
+        }
+        else {
+          $items .= '<li>'. t('<a href="%login">Login</a> to post a new forum topic.', array('%login' => url('user/login'))) .'</li>';
+        }
     }
-    $output .= '</ul>';
+    if ($items)
+        $output .= "<ul>$items</ul>";
 
     $output .= theme('forum_list', $forums, $parents, $tid);
 
-    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
+    if ($tid && !in_array($tid, $containers)) {
       $output .= theme('forum_topic_list', $tid, $topics, $sortby, $forum_per_page);
     }
     $output .= '</div>';