Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[ljcom] r8259: LJSV-605: LiveJournal locked fix

Committer: esavintcev
LJSV-605: LiveJournal locked fix
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2010-03-04 10:10:10 UTC (rev 8258)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2010-03-04 10:24:06 UTC (rev 8259)
@@ -1686,13 +1686,16 @@
           <div class="entryLinkbar"><ul>
           """;
           if ($.comments.enabled) {
-            if ($.itemid==int($*layout_guestbook_entryid)) { print safe """<li><a href="$.comments.post_url">$*text_post_comment_guestbook</a></li>""";
-            }else{
+            if ($.itemid==int($*layout_guestbook_entryid)) {
+				print safe """<li><a href="$.comments.post_url">$*text_post_comment_guestbook</a></li>""";
+            } else {
               if ($.comments.count > 0 or $.comments.screened) {
                 """<li><a href="$.comments.read_url">"""; print safe get_plural_phrase($.comments.count,"text_read_comments"); """</a></li>""";
               }
               $printqr = true;
-              """<li>"""; $p->print_reply_link({"linktext" => $*text_post_comment, "target" => "qr$.journal.username$.itemid", "reply_url" => $.comments.post_url}); """</li>""";
+				if (not $.comments.locked) {
+					"""<li>"""; $p->print_reply_link({"linktext" => $*text_post_comment, "target" => "qr$.journal.username$.itemid", "reply_url" => $.comments.post_url}); """</li>""";
+				}
             }
           }
           print safe """<li><a href="$.permalink_url">$*text_permalink</a></li>""";
@@ -1780,7 +1783,9 @@
             """<a href="$link.url" title="$link.caption">$link.caption</a>""";
         } else {
             ### showing reply link if comment not screened
-            $this->print_reply_link({ "linktext" => $*text_comment_reply });
+			if (not $.frozen) {
+				$this->print_reply_link({ "linktext" => $*text_comment_reply });
+			}
         }
           
           ##$this->print_reply_link({"linktext" => $*text_comment_reply}); 

Tags: ljcom, s2, savintsev_egor
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