From 07ad752820ef2398c0d9dfda630d2fb20b454d1f Mon Sep 17 00:00:00 2001
From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Mon, 4 Jun 2012 14:41:26 +0200
Subject: fixed: uncaught exception in uservalidationbyemail

---
 mod/uservalidationbyemail/start.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mod/uservalidationbyemail')

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index ea59a2e7b..f98f57faf 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -184,7 +184,11 @@ function uservalidationbyemail_page_handler($page) {
 				$user->enable();
 				elgg_pop_context();
 
-				login($user);
+				try {
+					login($user);
+				} catch(LoginException $e){
+					register_error($e->getMessage());
+				}
 			} else {
 				register_error(elgg_echo('email:confirm:fail'));
 			}
-- 
cgit v1.2.3