[ljcom] r10439: LJSV-1546: viewing of comments marked as...

U   trunk/bin/upgrading/s2layers/3column/layout.s2
U   trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
U   trunk/bin/upgrading/s2layers/boxer/layout.s2
U   trunk/bin/upgrading/s2layers/component/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-26 06:42:13 UTC (rev 10438)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
@@ -548,7 +548,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)) {
             """<div class="comment_wrapper"><div class="entrytext"><strong>$*text_spam_comment</strong></div></div>""";
         } elseif ($c.full) {
             $this->print_comment_full($c);

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-04-26 06:42:13 UTC (rev 10438)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
@@ -1095,7 +1095,7 @@
             """<div class="ljcmt_full" id="$c.dom_id" style='margin-left: ${indent}pt;'>\n<div class="bodybox" style="margin-top:13pt;"><strong>$*text_comment_screened</strong>""";
         } elseif ($c.deleted) {
             """<div class="ljcmt_full" id="$c.dom_id" style='margin-left: ${indent}pt;'>\n<div class="bodybox" style="margin-top:13pt;"><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 class="ljcmt_full" id="$c.dom_id" style='margin-left: ${indent}pt;'>\n<div class="bodybox" style="margin-top:13pt;"><strong>$*text_spam_comment</strong></div>""";
         } elseif ($c.full) {
             """<div class="ljcmt_full" id="$c.dom_id" style='margin-left: ${indent}pt;'>\n""";

Modified: trunk/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-04-26 06:42:13 UTC (rev 10438)
+++ trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
@@ -1205,11 +1205,9 @@
     if (size $cs == 0) { return; }
     var Page p = get_page();
     foreach var Comment c ($cs) {
-        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)) {
             var int sidewidth = 122 + ($c.depth - 1) * 25;
             print """ <a name="t$c.talkid"></a><table class="new" id="$c.dom_id" width="$*page_width" cellpadding="0" cellspacing="0"><tr><td style="background:#2F382E;" width="$sidewidth"></td><td width="2"></td><td class="entry"><div class="entrycontent"><strong>$*text_spam_comment</strong></div></td></tr></table> """;
-        } elseif ($c.spam and not $p.showspam and (size $c.replies) < 1) {
-            # spam comment w/o children
         } elseif ($c.full) {
             $this->print_comment($c);
         } else {

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-26 06:42:13 UTC (rev 10438)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
@@ -2824,7 +2824,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)) {
             var int margin = ($c.depth - 1) * 25;
             print "<div style=\"margin:3px 0 3px " + $margin + "px;border:1px solid #D6D6D6;\" class=\"entry\"><strong>$*text_spam_comment</strong></div>";
         } elseif ($c.full) {