[livejournal] r18969: LJSV-1546: viewing of comments marked as...

U   trunk/bin/upgrading/s2layers/deardiary/layout.s2
U   trunk/bin/upgrading/s2layers/generator/layout.s2

Modified: trunk/bin/upgrading/s2layers/deardiary/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/deardiary/layout.s2	2011-04-26 07:33:37 UTC (rev 18968)
+++ trunk/bin/upgrading/s2layers/deardiary/layout.s2	2011-04-26 07:36:16 UTC (rev 18969)
@@ -963,7 +963,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)) {
 	    """<div class="entry ljcmt_full" id="$c.dom_id">
                 <div class="entrycontent">
                     <strong>$*text_spam_comment</strong>

Modified: trunk/bin/upgrading/s2layers/generator/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/generator/layout.s2	2011-04-26 07:33:37 UTC (rev 18968)
+++ trunk/bin/upgrading/s2layers/generator/layout.s2	2011-04-26 07:36:16 UTC (rev 18969)
@@ -1330,7 +1330,7 @@
             """<div style='margin-left: ${indent}px;margin-top:5px;' id="$c.dom_id"><strong>$*text_comment_screened</strong>""";
         } elseif ($c.deleted) {
             """<div style='margin-left: ${indent}px;margin-top:5px;' id="$c.dom_id"><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)) {
             """<div style='margin-left: ${indent}px;margin-top:5px;' id="$c.dom_id">\n<strong>$*text_spam_comment\n</strong>""";
         } elseif ($c.full) {
             """<div style='margin-left: ${indent}px;margin-top:5px;' id="$c.dom_id" class="ljcmt_full">\n""";