Fixes #2529. User validation only prevents logins for disabled users to avoid conflic...

git-svn-id: http://code.elgg.org/elgg/trunk@7039 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 1dcb5509fd7cfa68647d6acee5a9b72f3ef67141..49dfdcc28f731e223a080208955dfd7c1d6a4e96 100644 (file)
--- 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);