Committer: mchervonniy
LJSUP-8605: reply link was removed from spammed commentU trunk/bin/upgrading/s2layers/sup/layout.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/layout.s2 2011-04-21 08:30:42 UTC (rev 10420) +++ trunk/bin/upgrading/s2layers/sup/layout.s2 2011-04-21 08:37:36 UTC (rev 10421) @@ -1464,6 +1464,7 @@ } function EntryPage::print_comment_full (Comment c) { + var Page p = get_page(); var string poster = defined $c.poster ? _user_print($c.poster, "microformatted") : "<em>$*text_poster_anonymous</em>"; var string evenodd = $c.depth % 2 ? "odd" : "even"; if (defined $c.userpic and $*comment_userpic_style != "off") { @@ -1495,11 +1496,11 @@ } elseif($c.screened) { var Link link = $c->get_link("unscreen_to_reply"); """(<a class="unscreen-to-reply" href="$link.url" title="$link.caption">$link.caption</a>) """; - } else { + } elseif ((not $c.spam) or ($p.showspam)) { "("; $c->print_reply_link({"linktext" => $*text_comment_reply}); ") "; } if ($c.parent_url != "") { print safe """(<a href="$c.parent_url">$*text_comment_parent</a>) """; } - if ($c.thread_url != "") { + if (($c.thread_url != "") and (not $c.spam)) { print safe """(<a href="$c.thread_url">$*text_comment_thread</a>) """; $c->print_expand_collapse_links(); }