From a262c16f062837f1b863ee7b09e4edda530eb7d1 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 2 Mar 2016 15:37:47 +0100
Subject: [PATCH] Catch exception on delete of Confirm_address in a plugin

---
 plugins/EmailRegistration/actions/emailregister.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/EmailRegistration/actions/emailregister.php b/plugins/EmailRegistration/actions/emailregister.php
index 7fa2aa22cf..d10b65c387 100644
--- a/plugins/EmailRegistration/actions/emailregister.php
+++ b/plugins/EmailRegistration/actions/emailregister.php
@@ -321,7 +321,11 @@ class EmailregisterAction extends Action
             common_init_language();
 
             if (!empty($this->confirmation)) {
-                $this->confirmation->delete();
+                try {
+                    $this->confirmation->delete();
+                } catch (ServerException $e) {
+                    common_log(LOG_ERR, $e->getMessage());
+                }
             }
 
             Event::handle('EndRegistrationTry', array($this));
-- 
2.39.5