Committer: afedorov
LJSUP-7957: Move "Spam comments" before "Leave a comment"U trunk/bin/upgrading/s2layers/sup/layout.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/layout.s2 2011-03-11 02:00:24 UTC (rev 10220) +++ trunk/bin/upgrading/s2layers/sup/layout.s2 2011-03-11 03:09:20 UTC (rev 10221) @@ -938,13 +938,13 @@ """; "<a name='comments'></a>"; var string comments_showspam = ""; - if ($e.comments.count > 0 and not $.entry.comments.locked) { + if ($e.comments.count > 0 and not $.entry.comments.locked and $e.comments.read_spam_url != "") { if ($p.showspam) { $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span> <span class="emdash">—</span> """; } else { $comments_showspam = """<span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a></span> <span class="emdash">—</span> """; } - } elseif ($e.comments.count > 0) { + } elseif ($e.comments.count > 0 and $e.comments.read_spam_url != "") { if ($p.showspam) { $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span> """; } else {