From 3f7935bf85088fbcd5aaee3c8a3d2605f9fab0ef Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 18 Sep 2016 14:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7/=E9=A1=B9=E7=9B=AE=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E9=94=81=E5=AE=9A=E5=9B=9E=E5=A4=8D=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E5=9B=9E=E5=A4=8D=E7=9A=84=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE=E6=9C=AA=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_message_replies.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
index 669aea26c..ce1e70887 100644
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@@ -24,6 +24,8 @@
                       <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                     </span>
                   <% if type == 'Message' %>
+                    <% topic = comment.root %>
+                    <% if !topic.locked? && authorize_for('messages', 'reply') %>
                     <span style="position: relative" class="fr mr20">
                         <%= link_to(
                                     l(:button_reply),
@@ -33,6 +35,7 @@
                                     :title => l(:button_reply)) %>
                       <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                     </span>
+                    <% end %>
                     <% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) %>
                       <%= link_to(
                                   l(:button_delete),