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

[livejournal] r18947: LJSUP-8605: reply link was removed from ...

Committer: mchervonniy
LJSUP-8605: reply link was removed from spammed comment
U   trunk/bin/upgrading/s2layers/punquin/layout.s2
Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-04-21 09:56:52 UTC (rev 18946)
+++ trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-04-21 09:59:19 UTC (rev 18947)
@@ -892,6 +892,7 @@
 }
 
 function EntryPage::print_comment_full (Comment c) {
+    var Page p = get_page();
     var Color background; var Color color;
     if ($c.screened) {
         $background = $*comment_bar_screened_bgcolor;
@@ -955,25 +956,27 @@
     print "</table></td></tr></table></div>";
     print "<div style='margin-left: 5px'>"; $c->print_text(); "</div>";
     print "<div style='margin-top: 3px; font-size: smaller'>";
-    if ($c.frozen) {
-        print "(Replies frozen)";
-    } else {
-        # print "(<a href='$c.reply_url'>Reply to this</a>) ";
-        print "("; 
-        ###$c->print_reply_link({"linktext" => $*text_comment_reply}); 
-        if($c.screened == true) {
-            ### if comment screened - show link for unscreen
-            var Link link;
-            $link = $c->get_link("unscreen_to_reply");
-            """<a href="$link.url" title="$link.caption">$link.caption</a>""";
+    if ((not $c.spam) or ($p.showspam)) {
+        if ($c.frozen) {
+            print "(Replies frozen)";
         } else {
-            ### showing reply link if comment not screened
-            $c->print_reply_link({ "linktext" => $*text_comment_reply });
+            # print "(<a href='$c.reply_url'>Reply to this</a>) ";
+            print "("; 
+            ###$c->print_reply_link({"linktext" => $*text_comment_reply}); 
+            if($c.screened == true) {
+                ### if comment screened - show link for unscreen
+                var Link link;
+                $link = $c->get_link("unscreen_to_reply");
+                """<a href="$link.url" title="$link.caption">$link.caption</a>""";
+            } else {
+                ### showing reply link if comment not screened
+                $c->print_reply_link({ "linktext" => $*text_comment_reply });
+            }
+            ") ";
         }
-        ") ";
     }
     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>) ";
 #          # var Link expand_link = $c->get_link("expand_comments");
 #          # if (defined $expand_link) {

Tags: fiskus_boulder, livejournal, 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