[livejournal] r18632: LJSUP-8123: statement spam counter

U   trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
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/refriedpaper/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-03-18 08:26:16 UTC (rev 18631)
+++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-03-18 08:28:31 UTC (rev 18632)
@@ -801,7 +801,7 @@
           $linkbar = $linkbar + """ $text""";
         }
         $linkbar = $linkbar + """</a>$btwn_comments""";
-        if ($p.view == "entry" and $en.comments.read_spam_url != "") {
+        if ($p.view == "entry" and $en.comments.spam_counter > 0 and $en.comments.read_spam_url != "") {
             if ($p.showspam) {
                 $linkbar = $linkbar + get_plural_phrase($en.comments.spam_counter, "text_read_spam_comments") + """$btwn_comments""";
             } else {

Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-03-18 08:26:16 UTC (rev 18631)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-03-18 08:28:31 UTC (rev 18632)
@@ -1184,7 +1184,7 @@
          if ($e.comments.show_postlink) { " $sep "; $e.comments->print_postlink(); }
          if ($e.comments.show_readlink)   {
             " $sep "; $e.comments->print_readlink();
-            if ($p.view == "entry" 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) {
                     print safe """ $sep """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments");
                 } else {

Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-03-18 08:26:16 UTC (rev 18631)
+++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-03-18 08:28:31 UTC (rev 18632)
@@ -723,7 +723,7 @@
             " | ";
         }
         if ($.show_readlink) {
-            if ($p.view == "entry" and $.read_spam_url != "") {
+            if ($p.view == "entry" and $.spam_counter > 0 and $.read_spam_url != "") {
                 if ($p.showspam) {
                     print safe get_plural_phrase($.spam_counter, "text_read_spam_comments") + """ | """;
                 } else {

Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-03-18 08:26:16 UTC (rev 18631)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-03-18 08:28:31 UTC (rev 18632)
@@ -944,7 +944,7 @@
         $this->print_multiform_start();
 
         print_header("Comments:");
-	if ($e.comments.read_spam_url != "") {
+	if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
 		if ($p.showspam) {
 		    print """<p width='95%' style='text-align:center;'>""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</p>""";
 		} else {