From ab052d645b6997feeaf15882ea1f0f9b0087adaa Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 10 Sep 2014 10:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=B8=96=E5=AD=90=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_memos.html.erb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 875fbd4fc..fdce1cc83 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -63,11 +63,16 @@
 								<div class="forums-info">								
 								<div style="padding-top: 20px" >
 								<span class="forums-avatar-left"><%= image_tag(url_to_avatar(@forum.creator), :class => 'vatar-size') %></span>
-								<span class="forums-avatar-right"><%=link_to @forum.creator.name, user_path(@forum.creator) %>
-								<div>
-								<%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %>	
-								<%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %></div></span>																
-								</div>																																																
+								<span class="forums-avatar-right">
+                                  <% unless @forum.creator.nil? %>
+                                    <%=link_to @forum.creator.name, user_path(@forum.creator) %>
+								    <div>
+								      <%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %>
+								      <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %>
+                                    </div>
+                                </span>
+								<% end %>
+                                </div>
 								</div>
 								<!--tags-->	
 								<% if User.current.logged? || User.current.admin? %>