X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84db1d66b7d819a4a777d2b9e5909cffe82c514e..9448eab143cd052e9ee48cabdf13a8525add1b2c:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 1f3d39808..df30d651b 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -89,15 +89,9 @@ class Notifier < ActionMailer::Base 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