From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 Sep 2013 15:05:16 +0000 (+0100)
Subject: Don't bother verifying an email address that hasn't changed
X-Git-Tag: live~4785
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ecf8c90e88462d340c1d661929a83d653e0ccaea

Don't bother verifying an email address that hasn't changed
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a7822e47f..db37d1131 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -732,7 +732,7 @@ private
 
       cookies.permanent["_osm_username"] = user.display_name
 
-      if user.new_email.blank?
+      if user.new_email.blank? or user.new_email == user.email
         flash.now[:notice] = t 'user.account.flash update success'
       else
         user.email = user.new_email