X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9b19a45e74abd4414bb79d6b992f7bec14390ad6..2c1033f62d450b7ed82058ee89d99983b7d97829:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1cc27d9d9..4c5827558 100644 --- 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 - 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 @@ -157,7 +157,7 @@ class UsersController < ApplicationController 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 @@ -343,7 +343,7 @@ class UsersController < ApplicationController 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 + UserMailer.signup_confirm(user, user.tokens.create).deliver_later flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe end @@ -659,7 +659,7 @@ class UsersController < ApplicationController 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