From d45e90e358008ed5d0174048a5b6e36278b6f242 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 19 Jul 2018 14:45:28 -0700 Subject: [PATCH] One more fix for #5893 --- app/Http/Controllers/Auth/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index b114cfc9ca..c3ed77d12d 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -97,7 +97,7 @@ class LoginController extends Controller } // Check if the user already exists in the database and was imported via LDAP - $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('active', '=', '1')->first(); + $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('activated', '=', '1')->first(); LOG::debug("Local auth lookup complete"); // The user does not exist in the database. Try to get them from LDAP.