Commit 0affa249 authored by Jonny Bradley's avatar Jonny Bradley

[FIX] login: Test for ACCOUNT_WAITING_USER in both validation and login modes

parent 6eaeadd7
......@@ -1422,7 +1422,7 @@ class UsersLib extends TikiLib
if (!empty($res['valid']) && $pass == $res['valid']) // used for validation of user account before activation
return array(USER_VALID, $user);
if ($validate_phase && $res['waiting'] == 'u')
if ($res['waiting'] == 'u')
return array(ACCOUNT_WAITING_USER, $user);
if ($res['waiting'] == 'a')
return array(ACCOUNT_DISABLED, $user);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment