Move errors from email to new_email properly

Author: tomhughes

app/controllers/concerns/user_methods.rb

@@ -59,8 +59,9 @@ def update_user(user, params)
             # 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!