aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-15 20:11:31 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-15 20:11:31 -0700
commitace4852849efafe39531ddf15c8281070d9b6950 (patch)
treeeb5f6b0b6e991b075832f3334152365a1e801ae9 /mod
parent15c0a0106be33711fe6b11e2c6acd2812d6e9bbe (diff)
parent07ad752820ef2398c0d9dfda630d2fb20b454d1f (diff)
downloadelgg-ace4852849efafe39531ddf15c8281070d9b6950.tar.gz
elgg-ace4852849efafe39531ddf15c8281070d9b6950.tar.bz2
Merge pull request #265 from jeabakker/#4404
#4404: uncaught exception in uservalidationbyemail
Diffstat (limited to 'mod')
-rw-r--r--mod/uservalidationbyemail/start.php6
1 files changed, 5 insertions, 1 deletions
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'));
}