From 2a9504c3b2f2c99cd52bfabb9d68cc9cf1da28c1 Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 9 Oct 2010 00:18:14 +0000 Subject: Fixes #2529. User validation only prevents logins for disabled users to avoid conflicting with alternative login plugins. git-svn-id: http://code.elgg.org/elgg/trunk@7039 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/uservalidationbyemail/start.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php index 1dcb5509f..49dfdcc28 100644 --- a/mod/uservalidationbyemail/start.php +++ b/mod/uservalidationbyemail/start.php @@ -192,7 +192,7 @@ function uservalidationbyemail_check_manual_login($event, $type, $user) { access_show_hidden_entities(TRUE); // @todo register_error()? - $return = ($user instanceof ElggUser && !$user->validated) ? FALSE : NULL; + $return = ($user instanceof ElggUser && $user->disabled == 'yes' && !$user->validated) ? FALSE : NULL; access_show_hidden_entities($access_status); -- cgit v1.2.3