aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-09 00:18:14 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-09 00:18:14 +0000
commit2a9504c3b2f2c99cd52bfabb9d68cc9cf1da28c1 (patch)
tree708ba5a1c55e96c7bc8458f8669d06013a0948a3 /mod
parent4bdaba2a420156ca7d5afa25a7439388121c8976 (diff)
downloadelgg-2a9504c3b2f2c99cd52bfabb9d68cc9cf1da28c1.tar.gz
elgg-2a9504c3b2f2c99cd52bfabb9d68cc9cf1da28c1.tar.bz2
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
Diffstat (limited to 'mod')
-rw-r--r--mod/uservalidationbyemail/start.php2
1 files changed, 1 insertions, 1 deletions
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);