DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-07-19 14:47:27 -07:00
parent f692fb5bff 9677115055
commit aa9c0078a1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View file

@ -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.

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => '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',
'full_hash' => 'v4.6.2-10-gbbb15d610',
'branch' => 'master',
);