From f8c8827b2416ad6d8b0a1beb4a58db66032a7508 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 13 Sep 2009 14:12:07 +0000
Subject: [PATCH] - Patch #554164 by mfb: fixed bug with forum topic counts and
added tests.
---
modules/forum/forum.module | 2 +-
modules/forum/forum.test | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index e61d47be7641..b88e04928e4e 100644
--- a/modules/forum/forum.module
+++ b/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
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index 9da887f56dd9..9faaad0f01de 100644
--- a/modules/forum/forum.test
+++ b/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>');
}
/**
--
GitLab