X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19e648687071f46fc84154824d4cb6f094003488..da059269f9e5d63b4029abf0e1b8b90d210dc7c5:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 7fc276042..df30d651b 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -84,20 +84,14 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,
                               :title => "Re: #{comment.diary_entry.title}")
   end
 
   def friend_notification(friend)
-    befriender = User.find_by_id(friend.user_id)
-    befriendee = User.find_by_id(friend.friend_user_id)
-
-    common_headers befriendee
-    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
-    body :user => befriender.display_name,
-         :userurl => url_for(:host => SERVER_URL,
-                             :controller => "user", :action => "view",
-                             :display_name => befriender.display_name)
+    common_headers friend.befriendee
+    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
+    body :friend => friend
   end
 
 private