Committer: mchervonniy
LJSUP-8806: Showing link to suspicious comments, if there is no normal comments, Punquin ElegantU trunk/bin/upgrading/s2layers/punquin/layout.s2
Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-08-15 09:46:12 UTC (rev 19722) +++ trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-08-15 09:58:23 UTC (rev 19723) @@ -680,11 +680,15 @@ print safe "$*text_left_comments"; if ($.show_readlink) { $this->print_readlink(); + } + if ($.spam_counter > 0) { if ($p.view == "entry" and $.spam_counter > 0 and $.read_spam_url != "") { - if (clean_url($*img_btwn_comments) != "") { - """ <img src="$*img_btwn_comments" alt="" /> """; - } else { - print safe "$*text_btwn_comments"; + if ($.show_readlink) { + if (clean_url($*img_btwn_comments) != "") { + """ <img src="$*img_btwn_comments" alt="" /> """; + } else { + print safe "$*text_btwn_comments"; + } } if ($p.showspam) { print safe get_plural_phrase($.spam_counter, "text_read_spam_comments"); @@ -693,7 +697,7 @@ } } } - if ($.show_postlink and $.show_readlink) { + if (($.show_postlink and $.show_readlink) or ($.spam_counter > 0)) { if (clean_url($*img_btwn_comments) != "") { """ <img src="$*img_btwn_comments" alt="" /> """; } else {