summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-03-12 08:09:09 +0000
committerDries Buytaert <dries@buytaert.net>2004-03-12 08:09:09 +0000
commit6e217dd64149fbeb74bb9b5c42af85490b3d73aa (patch)
treea21bf7518e3d544f7cdf6fa1f74526583b2abadc
parent2101f6c454d670a93ee445f84bfe839aa21bf049 (diff)
downloadbrdo-6e217dd64149fbeb74bb9b5c42af85490b3d73aa.tar.gz
brdo-6e217dd64149fbeb74bb9b5c42af85490b3d73aa.tar.bz2
- Bugfix: mark new comments when show as 'folded'
-rw-r--r--modules/comment.module20
-rw-r--r--modules/comment/comment.module20
2 files changed, 24 insertions, 16 deletions
diff --git a/modules/comment.module b/modules/comment.module
index a0225e44b..a54e41f69 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1386,18 +1386,22 @@ function theme_comment_moderation_form($comment) {
}
function theme_comment($comment, $links = 0) {
- $output .= "<div class=\"comment\">";
- $output .= "<div class=\"subject\">$comment->subject". ($comment->new ? " ". theme("mark") : "") ."</div>";
- $output .= "<div class=\"moderation\">". $comment->moderation ."</div>";
- $output .= "<div class=\"credit\">". t("by %a on %b", array("%a" => format_name($comment), "%b" => format_date($comment->timestamp))) ."</div>";
- $output .= "<div class=\"body\">". check_output($comment->comment) ."</div>";
- $output .= "<div class=\"links\">$links</div>";
- $output .= "</div>";
+ $output = "<div class=\"comment\">\n";
+ $output .= "<div class=\"subject\">$comment->subject". ($comment->new ? ' '. theme('mark') : '') ."</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\">". check_output($comment->comment) ."</div>\n";
+ $output .= "<div class=\"links\">$links</div>\n";
+ $output .= "</div>\n";
return $output;
}
function theme_comment_folded($comment) {
- return "<div class=\"comment-folded\"><span class=\"subject\">". l($comment->subject, comment_referer_load() ."/$comment->cid", NULL, NULL, "comment-$comment->cid") ."</span> <span class=\"credit\">". t("by") ." ". format_name($comment) ."</span></div>";
+ $output = "<div class=\"comment-folded\">\n";
+ $output .= " <span class=\"subject\">". l($comment->subject, comment_referer_load() ."/$comment->cid", NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark') : '') ."</span> ";
+ $output .= "<span class=\"credit\">". t("by") ." ". format_name($comment) ."</span>\n";
+ $output .= "</div>\n";
+ return $output;
}
function theme_comment_flat_collapsed($comment, $threshold) {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index a0225e44b..a54e41f69 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1386,18 +1386,22 @@ function theme_comment_moderation_form($comment) {
}
function theme_comment($comment, $links = 0) {
- $output .= "<div class=\"comment\">";
- $output .= "<div class=\"subject\">$comment->subject". ($comment->new ? " ". theme("mark") : "") ."</div>";
- $output .= "<div class=\"moderation\">". $comment->moderation ."</div>";
- $output .= "<div class=\"credit\">". t("by %a on %b", array("%a" => format_name($comment), "%b" => format_date($comment->timestamp))) ."</div>";
- $output .= "<div class=\"body\">". check_output($comment->comment) ."</div>";
- $output .= "<div class=\"links\">$links</div>";
- $output .= "</div>";
+ $output = "<div class=\"comment\">\n";
+ $output .= "<div class=\"subject\">$comment->subject". ($comment->new ? ' '. theme('mark') : '') ."</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\">". check_output($comment->comment) ."</div>\n";
+ $output .= "<div class=\"links\">$links</div>\n";
+ $output .= "</div>\n";
return $output;
}
function theme_comment_folded($comment) {
- return "<div class=\"comment-folded\"><span class=\"subject\">". l($comment->subject, comment_referer_load() ."/$comment->cid", NULL, NULL, "comment-$comment->cid") ."</span> <span class=\"credit\">". t("by") ." ". format_name($comment) ."</span></div>";
+ $output = "<div class=\"comment-folded\">\n";
+ $output .= " <span class=\"subject\">". l($comment->subject, comment_referer_load() ."/$comment->cid", NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark') : '') ."</span> ";
+ $output .= "<span class=\"credit\">". t("by") ." ". format_name($comment) ."</span>\n";
+ $output .= "</div>\n";
+ return $output;
}
function theme_comment_flat_collapsed($comment, $threshold) {