X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d24312fa8c79a370faa33c23c9bf3719c9931857..60f145f13eb2608ad003e2325aecfc8fb7c37159:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 2f22ad940..3a2bc7f0d 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -47,11 +47,8 @@ class UserController < ApplicationController
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
 
     if params[:user] and params[:user][:display_name] and params[:user][:description]
-      if params[:user][:email] != @user.email
-        @user.new_email = params[:user][:email]
-      end
-
       @user.display_name = params[:user][:display_name]
+      @user.new_email = params[:user][:new_email]
 
       if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
         @user.pass_crypt = params[:user][:pass_crypt]
@@ -66,21 +63,20 @@ class UserController < ApplicationController
       if @user.save
         set_locale
 
-        if params[:user][:email] == @user.new_email
+        if @user.new_email.nil? or @user.new_email.empty?
+          flash.now[:notice] = t 'user.account.flash update success'
+        else
           flash.now[:notice] = t 'user.account.flash update success confirm needed'
           Notifier.deliver_email_confirm(@user, @user.tokens.create)
-        else
-          flash.now[:notice] = t 'user.account.flash update success'
         end
       end
     else
       if flash[:errors]
         flash[:errors].each do |attr,msg|
+          attr = "new_email" if attr == "email"
           @user.errors.add(attr,msg)
         end
       end
-
-      @user.email = @user.new_email if @user.new_email
     end
   end