Committer: mchervonniy
LJSV-1546: viewing of comments marked as spamU trunk/bin/upgrading/s2layers/lickable/layout.s2 U trunk/bin/upgrading/s2layers/magazine/layout.s2 U trunk/bin/upgrading/s2layers/punquin/layout.s2 U trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
Modified: trunk/bin/upgrading/s2layers/lickable/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/lickable/layout.s2 2011-04-26 07:36:16 UTC (rev 18969) +++ trunk/bin/upgrading/s2layers/lickable/layout.s2 2011-04-26 07:41:36 UTC (rev 18970) @@ -1227,7 +1227,7 @@ } function EntryPage::print_comment(Comment c) { var Page p = get_page(); - if ($c.spam and not $p.showspam and (size $c.replies) > 0) { + if (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) { """<strong>$*text_spam_comment</strong>"""; } elseif ($c.spam and not $p.showspam and (size $c.replies) < 1) { # spam comment w/o children Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/magazine/layout.s2 2011-04-26 07:36:16 UTC (rev 18969) +++ trunk/bin/upgrading/s2layers/magazine/layout.s2 2011-04-26 07:41:36 UTC (rev 18970) @@ -928,7 +928,7 @@ """<strong>$*text_comment_screened</strong>"""; } elseif ($c.deleted) { """<strong>$*text_comment_deleted</strong>"""; - } elseif (($c.spam) and (not $p.showspam) and (size($c.replies) > 0)) { + } elseif (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) { """<strong>$*text_spam_comment</strong>"""; } elseif ($c.full) { $this->print_comment_full($c); Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-04-26 07:36:16 UTC (rev 18969) +++ trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-04-26 07:41:36 UTC (rev 18970) @@ -869,7 +869,7 @@ """<strong>$*text_comment_screened</strong>"""; } elseif ($c.deleted) { """<strong>$*text_comment_deleted</strong>"""; - } elseif (($c.spam) and (not $p.showspam) and (size($c.replies) > 0)) { + } elseif (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) { """<strong>$*text_spam_comment</strong>"""; } elseif ($c.full) { $this->print_comment_full($c); Modified: trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 2011-04-26 07:36:16 UTC (rev 18969) +++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 2011-04-26 07:41:36 UTC (rev 18970) @@ -1382,7 +1382,7 @@ foreach var Comment c ($cs) { var int indent = ($c.depth - 1) * 25; "<div id=\"$c.dom_id\" style='margin-left: ${indent}px; margin-top: 5px'>\n"; - if (($c.spam) and (not $p.showspam) and (size($c.replies) > 0)) { + if (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) { """$*text_spam_comment"""; } elseif (($c.spam) and (not $p.showspam)) { """&nsbp;""";