Merge branch 'master' into next

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

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d8e5443b1384406b876739000453b0282a8f4606..c9107e7a83d16111d8308f7cda6c0e5d30b38d66 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -67,7 +67,7 @@
         </a>
         <ul class='dropdown-menu'>
           <li>
         </a>
         <ul class='dropdown-menu'>
           <li>

-            <%= link_to inbox_path(:display_name => current_user.display_name) do %>
+            <%= link_to inbox_messages_path do %>

               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
               <%= t('user.view.my messages') %>
             <% end %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
               <%= t('user.view.my messages') %>
             <% end %>