From d45e90e358008ed5d0174048a5b6e36278b6f242 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 19 Jul 2018 14:45:28 -0700 Subject: [PATCH 1/2] 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 b114cfc9c..c3ed77d12 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. From 9677115055ede01e2e691be00576cf2029ada854 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 19 Jul 2018 14:46:08 -0700 Subject: [PATCH 2/2] Bumped version --- config/version.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/version.php b/config/version.php index 20504b1a5..1b6d53962 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.6.1', - 'full_app_version' => 'v4.6.1 - build 3842-gbbb15d610', - 'build_version' => '3842', + 'app_version' => 'v4.6.2', + 'full_app_version' => 'v4.6.2 - build 3844-', + 'build_version' => '3844', 'prerelease_version' => '', - 'hash_version' => 'gbbb15d610', - 'full_hash' => 'v4.6.0-10-gbbb15d610', + 'hash_version' => '', + 'full_hash' => 'v4.6.1', 'branch' => 'develop', ); \ No newline at end of file