X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e68d4efc3cdf02f35144e3967be998aaa633a3de..e47187a8fb45c9372ad3a7422f96d357e087676d:/app/controllers/concerns/user_methods.rb?ds=inline diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb index eb7d38988..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.tokens.create).deliver_later + UserMailer.email_confirm(user, token).deliver_later rescue StandardError # Ignore errors sending email end