X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56df4f3813a12a56d9352e5439423de78ed0c7b7..d38e476fa66a69285639ca4d6f94f7aa676e1d88:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 059377639..343c3db22 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -2,6 +2,7 @@ class Notifier < ActionMailer::Base
   default :from => EMAIL_FROM,
           :return_path => EMAIL_RETURN_PATH,
           :auto_submitted => "auto-generated"
+  helper :application
 
   def signup_confirm(user, token)
     @locale = user.preferred_language_from(I18n.available_locales)
@@ -62,7 +63,7 @@ class Notifier < ActionMailer::Base
     @locale = message.recipient.preferred_language_from(I18n.available_locales)
     @to_user = message.recipient.display_name
     @from_user = message.sender.display_name
-    @body = message.body
+    @text = message.body
     @title = message.title
     @readurl = url_for(:host => SERVER_URL,
                        :controller => "message", :action => "read",
@@ -80,7 +81,7 @@ class Notifier < ActionMailer::Base
     @locale = comment.diary_entry.user.preferred_language_from(I18n.available_locales)
     @to_user = comment.diary_entry.user.display_name
     @from_user = comment.user.display_name
-    @body = comment.body
+    @text = comment.body
     @title = comment.diary_entry.title
     @readurl = url_for(:host => SERVER_URL,
                        :controller => "diary_entry",
@@ -116,7 +117,7 @@ class Notifier < ActionMailer::Base
 private
 
   def from_address(name, type, id, digest)
-    if domain = MESSAGES_DOMAIN
+    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
       "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
     else
       EMAIL_FROM