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

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

diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index f7c26aea1fa90bf2a159e81ae5ec0b20473cb5cb..b2534e47b367c71dd0db8dedef604237e908a187 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -16,7 +16,7 @@
     </div>
     <div class='buttons'>
       <%= submit_tag t('message.new.send_button') %>
-      <%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize button' %>
+      <%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => current_user.display_name }, :class => 'deemphasize button' %>
     </div>
   </fieldset>
 <% end %>