Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.375.2.1
diff -u -r1.375.2.1 forum.module
--- modules/forum/forum.module 25 Jan 2007 21:49:20 -0000 1.375.2.1
+++ modules/forum/forum.module 20 Mar 2007 18:51:36 -0000
@@ -1004,10 +1004,14 @@
);
}
else {
- $rows[] = array(
+ $comments_per_page = variable_get('comment_default_per_page', 0);
+ $pagenum = NULL;
+ $pageno = ($topic->num_comments - $topic->new_replies) / $comments_per_page;
+ if ($pageno > 1) $pagenum = "page=" . intval($pageno);
+ $rows[] = array(
array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'),
array('data' => l($topic->title, "node/$topic->nid"), 'class' => 'topic'),
- array('data' => $topic->num_comments . ($topic->new_replies ? '
'. l(format_plural($topic->new_replies, '1 new', '@count new'), "node/$topic->nid", NULL, NULL, 'new') : ''), 'class' => 'replies'),
+ array('data' => $topic->num_comments . ($topic->new_replies ? '
'. l(format_plural($topic->new_replies, '1 new', '@count new'), "node/$topic->nid", NULL, $pagenum, 'new') : ''), 'class' => 'replies'),
array('data' => _forum_format($topic), 'class' => 'created'),
array('data' => _forum_format(isset($topic->last_reply) ? $topic->last_reply : NULL), 'class' => 'last-reply')
);
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.143
diff -u -r1.143 tracker.module
--- modules/tracker/tracker.module 10 Jan 2007 15:17:51 -0000 1.143
+++ modules/tracker/tracker.module 20 Mar 2007 18:45:42 -0000
@@ -100,9 +100,13 @@
$comments = $node->comment_count;
if ($new = comment_num_new($node->nid)) {
+ $comments_per_page = variable_get('comment_default_per_page', 0);
+ $pagenum = NULL;
+ $pageno = ($node->comment_count - comment_num_new($node->nid)) / $comments_per_page;
+ if ($pageno > 1) $pagenum = "page=" . intval($pageno);
$comments .= '
';
- $comments .= l(format_plural($new, '1 new', '@count new'), "node/$node->nid", NULL, NULL, 'new');
- }
+ $comments .= l(format_plural($new, '1 new', '@count new'), "node/$node->nid", NULL, $pagenum, 'new');
+ }
}
$rows[] = array(