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

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

diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index 4a898c0857b6c276c9df20b34f1f6e319b55b24f..919a3e4023c132a3476b661fe89a9e1d423cf5d5 100644 (file)
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %></h2>
+  <h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %></h2>

 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
 
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
 

-<% if @user.messages.size > 0 %>
+<% if current_user.messages.size > 0 %>

   <table class="messages">
     <thead>
       <tr>
   <table class="messages">
     <thead>
       <tr>


@@ -16,9 +16,9 @@
       </tr>
     </thead>
     <tbody>
       </tr>
     </thead>
     <tbody>

-        <%= render :partial => "message_summary", :collection => @user.messages %>
+        <%= render :partial => "message_summary", :collection => current_user.messages %>

     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
+  <div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>

 <% end %>
 <% end %>