X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/92ce228cbe24ed030090823d2a4e92ee5089732c..0a3aba7f891ba55a5500f02907cec15d44554eae:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 5ec401d18..a4eb0d4c3 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -6,11 +6,20 @@ class Notifier < ActionMailer::Base
 
   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
@@ -118,7 +127,7 @@ class Notifier < ActionMailer::Base
     @locale = recipient.preferred_language_from(I18n.available_locales)
     @noteurl = browse_note_url(comment.note, :host => SERVER_URL)
     @place = comment.note.nearby_place
-    @comment = RichText::Text.new(comment.body)
+    @comment =comment.body
     @owner = recipient == comment.note.author
     @commenter = comment.author_name