From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Feb 2010 19:09:28 +0000 (+0000)
Subject: Ignore exceptions when sending email to confirm changes of email
X-Git-Tag: live~6340^2~21
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b547145865dead87b650c255ba8710e578e95bef

Ignore exceptions when sending email to confirm changes of email
address. Closes #2744.
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 02cabb010..829d918c8 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -67,7 +67,12 @@ class UserController < ApplicationController
           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)
+
+          begin
+            Notifier.deliver_email_confirm(@user, @user.tokens.create)
+          rescue
+            # Ignore errors sending email
+          end
         end
       end
     else