diff options
Diffstat (limited to 'modules/comment.module')
| -rw-r--r-- | modules/comment.module | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/comment.module b/modules/comment.module index 18c46f354..22c51bd15 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -1017,7 +1017,7 @@ function comment_admin_overview($type = 'new') { while ($comment = db_fetch_object($result)) { $comment->name = $comment->uid ? $comment->registered_name : $comment->name; $rows[] = array( - l($comment->subject, "node/$comment->nid", array('title' => htmlspecialchars(truncate_utf8($comment->comment, 128))), NULL, "comment-$comment->cid") ." ". (node_is_new($comment->nid, $comment->timestamp) ? theme('mark', 'new') : ''), + l($comment->subject, "node/$comment->nid", array('title' => htmlspecialchars(truncate_utf8($comment->comment, 128))), NULL, "comment-$comment->cid") ." ". theme('mark', node_mark($comment->nid, $comment->timestamp)), format_name($comment), ($comment->status == 0 ? t('Published') : t('Not published')), format_date($comment->timestamp, 'small'), @@ -1428,8 +1428,7 @@ function theme_comment_view($comment, $links = '', $visible = 1) { // Emit selectors: $output = ''; - if (node_is_new($comment->nid, $comment->timestamp)) { - $comment->new = 1; + if (($comment->new = node_mark($comment->nid, $comment->timestamp)) != MARK_READ) { $output .= "<a id=\"new\"></a>\n"; } @@ -1549,7 +1548,7 @@ function theme_comment_moderation_form($comment) { function theme_comment($comment, $links = 0) { $output = "<div class=\"comment\">\n"; - $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark', 'new') : '') ."</div>\n"; + $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") . ' ' . theme('mark', $comment->new) ."</div>\n"; $output .= '<div class="moderation">'. $comment->moderation ."</div>\n"; $output .= '<div class="credit">'. t('by %a on %b', array('%a' => format_name($comment), '%b' => format_date($comment->timestamp))) ."</div>\n"; $output .= "<div class=\"body\">$comment->comment</div>\n"; @@ -1560,7 +1559,7 @@ function theme_comment($comment, $links = 0) { function theme_comment_folded($comment) { $output = "<div class=\"comment-folded\">\n"; - $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/'. $comment->cid, NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark', 'new') : '') .'</span> '; + $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/'. $comment->cid, NULL, NULL, "comment-$comment->cid") . ' '. theme('mark', $comment->new) .'</span> '; $output .= '<span class="credit">'. t('by') .' '. format_name($comment) ."</span>\n"; $output .= "</div>\n"; return $output; |