diff options
Diffstat (limited to 'modules-available/locations/baseconfig')
-rw-r--r-- | modules-available/locations/baseconfig/getconfig.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/locations/baseconfig/getconfig.inc.php b/modules-available/locations/baseconfig/getconfig.inc.php index 2cf5495d..3a0c918f 100644 --- a/modules-available/locations/baseconfig/getconfig.inc.php +++ b/modules-available/locations/baseconfig/getconfig.inc.php @@ -8,11 +8,11 @@ if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'stri $locationId = Request::any('value', 0, 'int'); } } -// TODO: machine specific mapping + if ($locationId === false) { - // Fallback to subnets - $locationId = Location::getFromIp($ip); + $locationId = Location::getFromIpAndUuid($ip, $uuid); } + $matchingLocations = array(); if ($locationId !== false) { // Get all parents |