Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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? %>