diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 651067475..1f74ccd5d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -68,7 +68,7 @@
- <%=link_to l(:field_homepage), home_path %> >
+ <%=link_to l(:field_homepage), home_path %> >
<%=link_to @user.name, user_path %>
@@ -122,7 +122,7 @@
<%= link_to l(:label_user_watcher)+"("+User.watched_by(@user.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist"%>
-
+
<%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users.count.to_s+")", :controller=>"users", :action=>"user_fanslist" %>
@@ -190,16 +190,16 @@
<% unless @user.user_extensions.nil? %>
<% if @user.user_extensions.identity == 0 || @user.user_extensions.identity == 1 %>
|
+ <% unless @user.user_extensions.school.nil? %>
<%= l(:field_occupation) %>:
|
+ <% end %>
- <% elsif @user.user_extensions.identity == 3 %>
+ <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %>
<%= l(:field_occupation) %>:
|