From 7fd73348a611b3b09b744cf094d57c52a813bfdc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 9 Sep 2016 17:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_forum.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 4544fd651..5d6c5bcad 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -1,5 +1,5 @@
 <% if ma.class == MemoMessage %>
-    <% if ma.memo_type == "Memo" && ma.memo %>
+    <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %></a>