diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
| commit | ea0140d87534c3b10e489d13a1449ebb79da832d (patch) | |
| tree | 85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /mod/uservalidationbyemail/start.php | |
| parent | 157117475338bcaab5fc3453ec54250343da595c (diff) | |
| parent | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff) | |
| download | elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2 | |
Merge branch 'lorea-preprod'
Diffstat (limited to 'mod/uservalidationbyemail/start.php')
| -rw-r--r-- | mod/uservalidationbyemail/start.php | 6 |
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')); } |