X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71cb2c50fcaf29e2b933fc981e40a00223d94d34..12ac6f8f27dfe63d9674fba54862db13a9e6d89a:/app/controllers/concerns/user_methods.rb diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb index 8cba09827..28305b5c3 100644 --- a/app/controllers/concerns/user_methods.rb +++ b/app/controllers/concerns/user_methods.rb @@ -45,13 +45,15 @@ module UserMethods if user.new_email.blank? || user.new_email == user.email flash[:notice] = t "accounts.update.success" else + token = user.generate_token_for(:new_email) + user.email = user.new_email if user.valid? flash[:notice] = t "accounts.update.success_confirm_needed" begin - UserMailer.email_confirm(user, user.generate_token_for(:new_email)).deliver_later + UserMailer.email_confirm(user, token).deliver_later rescue StandardError # Ignore errors sending email end