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

U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/gradient/layout.s2

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-26 07:37:44 UTC (rev 10440)
@@ -2226,7 +2226,7 @@
         } 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>""";
         }

Modified: trunk/bin/upgrading/s2layers/gradient/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/gradient/layout.s2	2011-04-26 07:34:26 UTC (rev 10439)
+++ trunk/bin/upgrading/s2layers/gradient/layout.s2	2011-04-26 07:37:44 UTC (rev 10440)
@@ -1727,7 +1727,7 @@
 function EntryPage::print_comments (Comment[] cs) {
    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 string indent = ($c.depth - 1) * 15 + "px";
          """<div id="$c.dom_id" class="comment" style="margin-left: $indent;"><strong>$*text_spam_comment</strong></div>""";
       } elseif ($c.spam and not $p.showspam and (size $c.replies) < 1) {