From 175ac86217fad06e51ec1bcee6920d8493469691 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 16:51:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B-=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=EF=BC=9A=E5=9B=9E=E5=A4=8D=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=20#1566?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 7b7bd359c..d2c94b094 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -12,8 +12,9 @@
 		<% id = 'project_respond_form_'+ reply.id.to_s %>
           <%= link_to reply.user.name, user_path(reply.user) %>
           回复
-          <% if show_name %>
-            <%= link_to reply.at_user.name,user_path(reply.at_user) %>
+          <% parent_jour = JournalsForMessage.find reply.m_reply_id %>
+          <% if show_name && parent_jour %>
+            <%= link_to parent_jour.user.name,user_path(parent_jour.user) %>
           <% else %>
             <%= l(:label_anonymous) %>
           <% end %>