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

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

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 6621c3e8ed760481bc87a39749c6ff7c48ca477e..c23eabe95acf59d99f7028c617f6e75b563b39aa 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -5,7 +5,7 @@
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>

-    <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>


@@ -24,7 +24,7 @@
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>

-    <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>