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

[ljcom] r10263: LJSUP-8123: statement spam counter

Committer: mchervonniy
LJSUP-8123: statement spam counter
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/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-03-18 08:26:53 UTC (rev 10262)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-03-18 08:41:41 UTC (rev 10263)
@@ -1691,7 +1691,7 @@
           <div class="entryLinkbar"><ul>
           """;
           var string comments_showspam = "";
-          if ($p.view == "entry" and $.comments.read_spam_url != "") {
+          if ($p.view == "entry" and $.comments.spam_counter > 0 and $.comments.read_spam_url != "") {
               if ($p.showspam) {
                   $comments_showspam = """<li>""" + get_plural_phrase($.comments.spam_counter, "text_read_spam_comments") + """</li>""";
               } else {

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-03-18 08:26:53 UTC (rev 10262)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-03-18 08:41:41 UTC (rev 10263)
@@ -1181,7 +1181,7 @@
 
         print "<h4>";
         print safe get_permalink($e.permalink_url);
-        if ( $p.view == "entry" and $e.comments.count > 0 and $e.comments.read_spam_url != "") {
+        if ( $p.view == "entry" and $e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
             if ($p.showspam) {
                 """ | """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>""";
             } else {

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-03-18 08:26:53 UTC (rev 10262)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-03-18 08:41:41 UTC (rev 10263)
@@ -986,7 +986,7 @@
             $sidebar = $sidebar + """<a href="$e.comments.post_url">""" +
               ($.view == "friends" ? $*text_post_comment_friends : $*text_post_comment) + "</a><br />";
         }
-        if (($e.comments.count > 0 or $e.comments.screened) and $.view == "entry" and $e.comments.read_spam_url != "") {
+        if (($e.comments.spam_counter > 0 or $e.comments.screened) and $.view == "entry" and $e.comments.read_spam_url != "") {
             if ($p.showspam) {
                   $sidebar = $sidebar + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """<br />""";
             } else {

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-03-18 08:26:53 UTC (rev 10262)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-03-18 08:41:41 UTC (rev 10263)
@@ -1962,7 +1962,7 @@
         }
 
         var string comments_showspam = "";
-        if ($.entry.comments.count > 0 and $.entry.comments.read_spam_url != "") {
+        if ($.entry.comments.spam_counter > 0 and $.entry.comments.read_spam_url != "") {
             if ($p.showspam) {
                 $comments_showspam = """<span class="comments-hidespam">""" + get_plural_phrase($.entry.comments.spam_counter, "text_read_spam_comments") + """</span> <span class="emdash">—</span> """;
             } else {

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