[ljcom] r10105: LJSUP-7758: AntiSpam S2

U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-02-24 09:13:29 UTC (rev 10104)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-02-24 09:31:39 UTC (rev 10105)
@@ -1179,9 +1179,9 @@
         print safe get_permalink($e.permalink_url);
         if ( $p.view == "entry" and $e.comments.count > 0) {
             if ($p.showspam) {
-                """ | <a href=\"$e.permalink_url\">$*text_hidespam</a></span>""";
+                """ | <a href=\"$e.comments.read_spam_url\">$*text_hidespam</a></span>""";
             } else {
-                """ | <a href=\"$e.permalink_url?mode=showspam\">$*text_showspam</a></span>""";
+                """ | <a href=\"$e.comments.read_spam_url\">$*text_showspam</a></span>""";
             }
         }
         if ( $p.view != "entry" and $p.view != "reply" ) {

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-02-24 09:13:29 UTC (rev 10104)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-02-24 09:31:39 UTC (rev 10105)
@@ -987,9 +987,9 @@
         }
         if (($e.comments.count > 0 or $e.comments.screened) and $.view == "entry") {
             if ($p.showspam) {
-                  $sidebar = $sidebar + """<a href=\"$e.comments.read_url\">$*text_hidespam</a><br />""";
+                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_hidespam</a><br />""";
             } else {
-                  $sidebar = $sidebar + """<a href=\"$e.comments.read_url?mode=showspam\">$*text_showspam</a><br />""";
+                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_showspam</a><br />""";
             }
         }
     }