From 039c77121a7ef9af981f6619368018d2bc14fd16 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 8 Jul 2004 06:15:49 +0000
Subject: [PATCH] - Patch #9031 by Morbus: this last tracker patch was broken -
for installations where the comment.module is turned on, $comments is never
set to 0, and posts that have no comments instead get the value of the last
successful comment_num_all. The attached patch corrects this ($comments is
set to 0 before we do anything) and also merges the if statements.
---
modules/tracker.module | 18 +++++++-----------
modules/tracker/tracker.module | 18 +++++++-----------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/modules/tracker.module b/modules/tracker.module
index 9b68752ae5f5..a8cc7439dbac 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -52,19 +52,15 @@ function tracker_page($uid = 0) {
while ($node = db_fetch_object($result)) {
// Determine the number of comments:
- if (module_exist('comment')) {
- if ($all = comment_num_all($node->nid)) {
- $comments = $all;
-
- if ($new = comment_num_new($node->nid)) {
- $comments .= '<br />';
- $comments .= l(t('%num new', array('%num' => $new)), "node/$node->nid", NULL, NULL, 'new');
- }
+ $comments = 0;
+ if (module_exist('comment') && $all = comment_num_all($node->nid)) {
+ $comments = $all;
+
+ if ($new = comment_num_new($node->nid)) {
+ $comments .= '<br />';
+ $comments .= l(t('%num new', array('%num' => $new)), "node/$node->nid", NULL, NULL, 'new');
}
}
- else {
- $comments = 0;
- }
$rows[] = array(
ucfirst(node_invoke($node->type, 'node_name')),
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index 9b68752ae5f5..a8cc7439dbac 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -52,19 +52,15 @@ function tracker_page($uid = 0) {
while ($node = db_fetch_object($result)) {
// Determine the number of comments:
- if (module_exist('comment')) {
- if ($all = comment_num_all($node->nid)) {
- $comments = $all;
-
- if ($new = comment_num_new($node->nid)) {
- $comments .= '<br />';
- $comments .= l(t('%num new', array('%num' => $new)), "node/$node->nid", NULL, NULL, 'new');
- }
+ $comments = 0;
+ if (module_exist('comment') && $all = comment_num_all($node->nid)) {
+ $comments = $all;
+
+ if ($new = comment_num_new($node->nid)) {
+ $comments .= '<br />';
+ $comments .= l(t('%num new', array('%num' => $new)), "node/$node->nid", NULL, NULL, 'new');
}
}
- else {
- $comments = 0;
- }
$rows[] = array(
ucfirst(node_invoke($node->type, 'node_name')),
--
GitLab