X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..03f733c4f4091dc53e391aa74a020681af98a4ff:/app/models/notifier.rb?ds=sidebyside

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 6ba90ce58..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
@@ -112,7 +106,7 @@ private
 
   def from_header(name, type, id, digest)
     if domain = APP_CONFIG['messages_domain']
-      from "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
     end
   end
 end