Merge remote-tracking branch 'upstream/pull/1973'
[rails.git] / app / models / notifier.rb
index 3008b7fa42742c349c09dbd6d364569895d86d1e..554d1e364ffc5c1e01b83ee63f903fa61709bfba 100644 (file)
@@ -104,8 +104,7 @@ class Notifier < ActionMailer::Base
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend
-      @viewurl = url_for(:controller => "user", :action => "view",
-                         :display_name => @friend.befriender.display_name)
+      @viewurl = user_url(@friend.befriender)
       @friendurl = url_for(:controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name