From: Andy Allan <git@gravitystorm.co.uk>
Date: Sun, 16 Feb 2025 14:17:44 +0000 (+0000)
Subject: Merge pull request #5689 from tomhughes/settings-fixes
X-Git-Tag: live~295
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e858cdc2b47026b96904088ee5f0c1452eae966f?hp=c50e4f50c4fef0b11970202d3c7f95cdc5b620ba

Merge pull request #5689 from tomhughes/settings-fixes

User settings fixes
---

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 085d1bfea..d02943640 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -31,7 +31,7 @@ class AccountsController < ApplicationController
        (params[:user][:auth_provider] == current_user.auth_provider &&
         params[:user][:auth_uid] == current_user.auth_uid)
       update_user(current_user, user_params)
-      if current_user.errors.count.zero?
+      if current_user.errors.empty?
         redirect_to edit_account_path
       else
         render :edit
diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb
index d79ed48d2..447aea3fc 100644
--- a/app/controllers/concerns/user_methods.rb
+++ b/app/controllers/concerns/user_methods.rb
@@ -59,8 +59,9 @@ module UserMethods
             # Ignore errors sending email
           end
         else
-          current_user.errors.add(:new_email, current_user.errors[:email])
-          current_user.errors.add(:email, [])
+          current_user.errors.delete(:email).each do |error|
+            current_user.errors.add(:new_email, error)
+          end
         end
 
         user.restore_email!