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

LJSV-1546: viewing of comments marked as spam

U   trunk/bin/upgrading/s2layers/sixhtml/layout.s2
U   trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
U   trunk/bin/upgrading/s2layers/tabularindent/layout.s2

Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-04-26 07:41:36 UTC (rev 18970)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-04-26 07:45:22 UTC (rev 18971)
@@ -1024,7 +1024,7 @@
         """<div class="comment collapsed-comment"><div class="comment-footer"><strong>$*text_comment_screened</strong></div></div>""";
     } elseif ($c.deleted) {
         """<div class="comment collapsed-comment"><div class="comment-footer"><strong>$*text_comment_deleted</strong></div></div>""";
-    } 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 collapsed-comment"><div class="comment-footer"><strong>$*text_spam_comment</strong></div></div>""";
     } elseif ($c.full) {
         $this->print_comment_full($c);

Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-04-26 07:41:36 UTC (rev 18970)
+++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-04-26 07:45:22 UTC (rev 18971)
@@ -801,7 +801,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/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-04-26 07:41:36 UTC (rev 18970)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-04-26 07:45:22 UTC (rev 18971)
@@ -1023,7 +1023,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);