Максим Червонный (fiskus_boulder) wrote in changelog,
Максим Червонный
fiskus_boulder
changelog

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

Committer: mchervonniy
LJSV-1546: viewing of comments marked as spam
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-26 07:43:22 UTC (rev 10441)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-26 07:59:52 UTC (rev 10442)
@@ -1846,7 +1846,7 @@
             """<div style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_comment_screened</strong></div></div></div>""";
         } elseif ($c.deleted) {
             """<div style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_comment_deleted</strong></div></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 style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_spam_comment</strong></div></div></div>""";
             
         } elseif ($c.full) {

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-04-26 07:43:22 UTC (rev 10441)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-04-26 07:59:52 UTC (rev 10442)
@@ -1380,7 +1380,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/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-26 07:43:22 UTC (rev 10441)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-26 07:59:52 UTC (rev 10442)
@@ -2351,7 +2351,7 @@
         """<div $id style="margin-left: $indent"><strong>$*text_comment_screened</strong></div>""";
     } elseif ($c.deleted) {
         """<strong><div $id style="margin-left: $indent">$*text_comment_deleted</strong></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)) {
         """<strong><div $id style="margin-left: $indent">$*text_spam_comment</strong></div>""";
     } elseif ($c.full) {
         $this->print_comment_full($c);

Tags: fiskus_boulder, ljcom, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments