diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index 29b9eced3..afe1070dd 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -108,13 +108,17 @@ class LdapSync extends Command $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose if ($this->option('location') != '') { - $location = Location::where('name', '=', $this->option('location'))->first(); - Log::debug('Location name '.$this->option('location').' passed'); - Log::debug('Importing to '.$location->name.' ('.$location->id.')'); + if ($location = Location::where('name', '=', $this->option('location'))->first()) { + Log::debug('Location name '.$this->option('location').' passed'); + Log::debug('Importing to '.$location->name.' ('.$location->id.')'); + } + } elseif ($this->option('location_id') != '') { - $location = Location::where('id', '=', $this->option('location_id'))->first(); - Log::debug('Location ID '.$this->option('location_id').' passed'); - Log::debug('Importing to '.$location->name.' ('.$location->id.')'); + if ($location = Location::where('id', '=', $this->option('location_id'))->first()) { + Log::debug('Location ID '.$this->option('location_id').' passed'); + Log::debug('Importing to '.$location->name.' ('.$location->id.')'); + } + } if (! isset($location)) { diff --git a/config/version.php b/config/version.php index 8381c1963..b220a1255 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.2.2', - 'full_app_version' => 'v6.2.2 - build 11714-ga95fae0e9', - 'build_version' => '11714', + 'app_version' => 'v6.2.3', + 'full_app_version' => 'v6.2.3 - build 11759-g8c4bf74f9', + 'build_version' => '11759', 'prerelease_version' => '', - 'hash_version' => 'ga95fae0e9', - 'full_hash' => 'v6.2.2-85-ga95fae0e9', + 'hash_version' => 'g8c4bf74f9', + 'full_hash' => 'v6.2.3-42-g8c4bf74f9', 'branch' => 'develop', ); \ No newline at end of file