[ljcom] r10418: LJSUP-8605: reply link removed for spamm...

LJSUP-8605: reply link removed for spammed comment

U   trunk/bin/upgrading/s2layers/component/layout.s2

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-21 07:56:24 UTC (rev 10417)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-21 08:12:16 UTC (rev 10418)
@@ -2215,7 +2215,7 @@
                                 if ($p.showspam) {
                                     $comments_showspam = """ or """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments");
                                 } else {
-                                    $comments_showspam = """or <a href="$e.comments.read_spam_url">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
+                                    $comments_showspam = """ or <a href="$e.comments.read_spam_url">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
                                 }
                             } else {
                                 $comments_showspam = "";
@@ -2831,6 +2831,7 @@
 # Runs for every entry found
 function EntryPage::print_comment_full (Comment c) {
     var Color background; var Color color;
+    var Page p = get_page();
 
     $color = $*entry_fgcolor;
 
@@ -2929,7 +2930,7 @@
     "<div class=\"small\">";
     if ($c.frozen) {
         "(Replies frozen) ";
-    } else {
+    } elseif ((not $c.spam) or ($p.showspam)) {
         if($c.screened == true) {
             ### if comment screened - show link for unscreen
             var Link link;
@@ -2947,7 +2948,7 @@
          ###"(<a href=\"$c.reply_url\">Reply to this</a>) ";
     }
     if ($c.parent_url != "") {     "(<a href=\"$c.parent_url\">Parent</a>) "; }
-    if ($c.thread_url != "") {
+    if (($c.thread_url != "") and (not $c.spam)) {
         "(<a href=\"$c.thread_url\">Thread</a>) ";
         $c->print_expand_collapse_links();
     }