[ljcom] r10422: LJSUP-8605: reply link was removed fron ...

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

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-21 08:37:36 UTC (rev 10421)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-21 09:13:32 UTC (rev 10422)
@@ -2230,10 +2230,6 @@
         {
             """<strong>$*text_spam_comment</strong>""";
         }
-        elseif ($c.spam and not $p.showspam and (size $c.replies) < 1)
-        {
-            # spam comment w/o children
-        }
         elseif ( $c.full )
         {
             $this->print_comment_full( $c );
@@ -2246,6 +2242,7 @@
 }
 function EntryPage::print_comment_full (Comment comment) {
 
+    var Page p = get_page();
     var string subject = $comment.subject ? $comment.subject : $*text_nosubject;
     var string date = $comment.time->date_format();
     var string poster = isnull $comment.poster ? $*text_poster_anonymous : $comment.poster->as_string();
@@ -2304,7 +2301,7 @@
     {
         "($*text_comment_frozen)";
     }
-    else
+    elseif ((not $comment.spam) or ($p.showspam))
     {
         print "("; 
         
@@ -2329,7 +2326,7 @@
         "(<a href='$comment.parent_url'>$*text_comment_parent</a>) ";
     }
 
-    if ($comment.thread_url != "")
+    if ($comment.thread_url != "" and (not $comment.spam))
     {
         """(<a href="$comment.thread_url">$*text_comment_thread</a>) """;
         var Link expand_link = $comment->get_link("expand_comments");