Fixup some error handling in map bugs

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 6ba90ce58954b0096cc621ba260bb80e0f86a4ce..1f3d39808ecafcfd29a56debb63fe9dfc925dc7d 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -84,7 +84,7 @@ 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
 
@@ -112,7 +112,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