Merge remote-tracking branch 'upstream/pull/2444'

[rails.git] / app / views / layouts / _inbox.html.erb

diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
index 02c22e26c1c264967ce23bc3fe4f2ae8aefd9272..79a1db2da4fa56f150b45e343e548bd3f501464e 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1 +1,3 @@
-<span id="inboxanchor" class="count-number"><%= @user.new_messages.size %></span>
+<% if current_user.new_messages.size > 0 %>
+<span id="inboxanchor" class="count-number"><%= current_user.new_messages.size %></span>
+<% end %>