[livejournal] r19725: LJSUP-8806: Showing link to suspicious c...

U   trunk/bin/upgrading/s2layers/magazine/layout.s2

Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-08-15 10:00:58 UTC (rev 19724)
+++ trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-08-15 10:08:55 UTC (rev 19725)
@@ -670,11 +670,15 @@
         print safe "<div class='Comment'>$*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");
@@ -683,7 +687,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 {