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

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

Committer: mchervonniy
LJSUP-8605: reply link was removed from spammed comment
U   trunk/bin/upgrading/s2layers/sixhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-04-21 09:49:07 UTC (rev 18944)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-04-21 09:52:57 UTC (rev 18945)
@@ -1052,6 +1052,7 @@
 }
 
 function EntryPage::print_comment_full(Comment e) {
+     var Page p = get_page();
      "<div class='comment'>\n";
  
      "<div class='comment-userpic'>";
@@ -1088,11 +1089,11 @@
      "<a class='permalink' href='$e.permalink_url'>$*text_permalink</a>";
  
      if ($e.parent_url) { print " $sep <a href='$e.parent_url'>$*text_comment_parent</a>"; }
-     if ($e.thread_url) {
+     if (($e.thread_url != "") and (not $e.spam)) {
          print " $sep <a href='$e.thread_url'>$*text_comment_thread</a>";
          $e->print_expand_collapse_links();
      }
-     if ($e.reply_url)  {
+     if (($e.reply_url != "") and ((not $e.spam) or ($p.showspam)))  {
  if (not $e.frozen) {
          print " $sep ";
  }

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