aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-19 11:53:19 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-19 11:53:19 +0000
commit4e80f7476e20887f1a8f43fd0c0bf70a031c774b (patch)
tree6d9742b5cce58dc20fe773b27d36f641798e2b9f
parent961e31c8833220e85b5c73651576642101a94b15 (diff)
downloadelgg-4e80f7476e20887f1a8f43fd0c0bf70a031c774b.tar.gz
elgg-4e80f7476e20887f1a8f43fd0c0bf70a031c774b.tar.bz2
Closes #2653 users are logged in on registration and login exceptions are caught for unvalidated users
git-svn-id: http://code.elgg.org/elgg/trunk@7345 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--actions/register.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/actions/register.php b/actions/register.php
index 52176c5de..1a0954e3b 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -54,6 +54,14 @@ if ($CONFIG->allow_registration) {
system_message(elgg_echo("registerok", array($CONFIG->sitename)));
+ // if exception thrown, this probably means there is a validation
+ // plugin that has disabled the user
+ try {
+ login($new_user);
+ } catch (LoginException $e) {
+ // do nothing
+ }
+
// Forward on success, assume everything else is an error...
forward();
} else {