X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d4853bdc29acf8581fe240475a6ca856ca3a4119..ee6e0d5c0baf90c1464b8f0301cfbafed6685f98:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 2b6574a97..2a5bb15bc 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -2,14 +2,24 @@ 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)
-    @url = url_for(:host => SERVER_URL,
-                   :controller => "user", :action => "confirm",
-                   :display_name => user.display_name,
-                   :confirm_string => token.token)
-
+    
+    # If we are passed an email address verification token, create
+    # the confirumation URL for account activation.
+    #
+    # Otherwise the email has already been verified e.g. through
+    # a trusted openID provider and the account is active and a
+    # confirmation URL is not needed.
+    if token
+      @url = url_for(:host => SERVER_URL,
+                     :controller => "user", :action => "confirm",
+                     :display_name => user.display_name,
+                     :confirm_string => token.token)
+    end
+      
     mail :to => user.email,
          :subject => I18n.t('notifier.signup_confirm.subject', :locale => @locale)
   end
@@ -80,7 +90,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",