From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Jan 2025 12:27:05 +0000 (+0000)
Subject: Move errors from email to new_email properly
X-Git-Tag: live~28^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3be14c2a0530f94f70af4a90577b805ff25be8f7

Move errors from email to new_email properly
---

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!