mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-13 06:47:46 -08:00
Merge branch 'develop' of github.com:snipe/snipe-it into develop
This commit is contained in:
commit
c977dda5bb
4
app/Console/Commands/LdapSync.php
Normal file → Executable file
4
app/Console/Commands/LdapSync.php
Normal file → Executable file
|
@ -90,11 +90,11 @@ class LdapSync extends Command
|
||||||
LOG::debug('Location ID '.$this->option('location_id').' passed');
|
LOG::debug('Location ID '.$this->option('location_id').' passed');
|
||||||
LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
|
LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
|
||||||
} else {
|
} else {
|
||||||
$location = new Location;
|
$location = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($location)) {
|
if (!isset($location)) {
|
||||||
LOG::debug('That location is invalid, so no location will be assigned by default.');
|
LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Grab subsets based on location-specific DNs, and overwrite location for these users.
|
// Grab subsets based on location-specific DNs, and overwrite location for these users.
|
||||||
|
|
Loading…
Reference in a new issue