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

[rails.git] / app / views / message / _message_count.html.erb

diff --git a/app/views/message/_message_count.html.erb b/app/views/message/_message_count.html.erb
index 9b5edd26cf3cfad0251d2f6f3664362b2fc392d3..3a995c17144bb37e389a8de93c49e0d77dbbc83b 100644 (file)
--- a/app/views/message/_message_count.html.erb
+++ b/app/views/message/_message_count.html.erb
@@ -1,8 +1,8 @@
 <p id="inbox-count">
 <%= t "message.inbox.messages",
 <p id="inbox-count">
 <%= t "message.inbox.messages",

-      :new_messages => t("message.inbox.new_messages", 
-                         :count => @user.new_messages.size),
-      :old_messages => t("message.inbox.old_messages", 
-                         :count => @user.messages.size - @user.new_messages.size)
+      :new_messages => t("message.inbox.new_messages",
+                         :count => current_user.new_messages.size),
+      :old_messages => t("message.inbox.old_messages",
+                         :count => current_user.messages.size - current_user.new_messages.size)

 %>
 %>

-</p> 
+</p>