DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #5078 - check for object or array as location in LDAP sync

Browse source
This commit is contained in:
snipe 2018-03-05 22:42:40 -08:00
parent 9a25cb3ee7
commit 04d2542b81
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Console/Commands/LdapSync.php
View file

@ -190,7 +190,13 @@ class LdapSync extends Command
if ($item['ldap_location_override'] == true) { if ($item['ldap_location_override'] == true) {
$user->location_id = $item['location_id']; $user->location_id = $item['location_id'];
} elseif ((isset($location)) && (!empty($location))) { } elseif ((isset($location)) && (!empty($location))) {
$user->location_id = e($location->id);
if (is_array($location)) {
$user->location_id = $location['id'];
} elseif (is_object($location)) {
$user->location_id = $location->id;
}
} }
$user->notes = 'Imported from LDAP'; $user->notes = 'Imported from LDAP';