From 5ec31603058d5c4108d08ed5cfa62707aaeced7d Mon Sep 17 00:00:00 2001
From: Francis Irving <francis@mysociety.org>
Date: Wed, 10 Mar 2010 03:54:40 +0000
Subject: Use bob instead of silly as test user. Make it behave better if
 existing email changed to.

---
 app/controllers/user_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/controllers/user_controller.rb')

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index ec0afc214..80163db1d 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -246,11 +246,16 @@ class UserController < ApplicationController
             @signchangeemail.logged_in_user = @user
 
             if @signchangeemail.valid?
+                user_alreadyexists = User.find_user_by_email(@signchangeemail.new_email)
+                if user_alreadyexists
+                    already_registered_mail user_alreadyexists
+                    return
+                end
+
                 @user.email = @signchangeemail.new_email
                 @user.email_confirmed = false
                 @user.save!
                 self._do_signout
-                flash[:notice] = "Your email has been changed."
                 send_confirmation_mail @user
                 return
             end
-- 
cgit v1.2.3