- Patch #554164 by mfb: fixed bug with forum topic counts and added tests.

modules/forum/forum.module

@@ -623,7 +623,7 @@ function forum_get_forums($tid = 0) {
   if (count($_forums)) {
     $query = db_select('node', 'n');
     $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid');
-    $query->join('forum', 'f', 'f.vid = f.vid');
+    $query->join('forum', 'f', 'n.vid = f.vid');
     $query->addExpression('COUNT(n.nid)', 'topic_count');
     $query->addExpression('SUM(ncs.comment_count)', 'comment_count');
     $counts = $query

modules/forum/forum.test

@@ -63,6 +63,11 @@ class ForumTestCase extends DrupalWebTestCase {
     $this->drupalLogin($this->any_user);
     // Verify the any forum user has access to all the forum nodes.
     $this->verifyForums($this->own_user, $node, TRUE);
+
+    // Verify the topic and post counts on the forum page.
+    $this->drupalGet('forum');
+    $this->assertRaw("<td class=\"topics\">\n          6                  </td>");
+    $this->assertRaw('<td class="posts">6</td>');
   }
 
   /**