Merge remote-tracking branch 'upstream/pull/2890'

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1cc27d9d9001e05214574abf1105e51db5a0847a..cb92af8fbb217443aadb748c06b59c90158bbcab 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -106,7 +106,7 @@ class UsersController < ApplicationController
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token

-            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later
+            UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later

             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else
             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else


@@ -157,7 +157,7 @@ class UsersController < ApplicationController
 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.lost_password(user, token).deliver_later
+        UserMailer.lost_password(user, token).deliver_later

         flash[:notice] = t "users.lost_password.notice email on way"
         redirect_to :action => "login"
       else
         flash[:notice] = t "users.lost_password.notice email on way"
         redirect_to :action => "login"
       else


@@ -343,8 +343,8 @@ class UsersController < ApplicationController
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else

-      Notifier.signup_confirm(user, user.tokens.create).deliver_later
-      flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe
+      UserMailer.signup_confirm(user, user.tokens.create).deliver_later
+      flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email

     end
 
     redirect_to :action => "login"
     end
 
     redirect_to :action => "login"


@@ -659,7 +659,7 @@ class UsersController < ApplicationController
           flash.now[:notice] = t "users.account.flash update success confirm needed"
 
           begin
           flash.now[:notice] = t "users.account.flash update success confirm needed"
 
           begin

-            Notifier.email_confirm(user, user.tokens.create).deliver_later
+            UserMailer.email_confirm(user, user.tokens.create).deliver_later

           rescue StandardError
             # Ignore errors sending email
           end
           rescue StandardError
             # Ignore errors sending email
           end