diff options
Diffstat (limited to 'modules-available/locations/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/locations/baseconfig/getconfig.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/locations/baseconfig/getconfig.inc.php b/modules-available/locations/baseconfig/getconfig.inc.php index 26e43ed8..1bed5de7 100644 --- a/modules-available/locations/baseconfig/getconfig.inc.php +++ b/modules-available/locations/baseconfig/getconfig.inc.php @@ -1,5 +1,8 @@ <?php +/** @var ?string $uuid */ +/** @var ?string $ip */ + // Location handling: figure out location $locationId = false; if (BaseConfig::hasOverride('locationid')) { @@ -12,7 +15,7 @@ if (BaseConfig::hasOverride('locationid')) { } if ($locationId === false) { - if (!$ip) // Required at this point, bail out if not given + if ($ip === null) // Required at this point, bail out if not given return; $locationId = Location::getFromIpAndUuid($ip, $uuid); } @@ -31,7 +34,7 @@ if (!empty($matchingLocations)) { FROM setting_location WHERE locationid IN (:list)", ['list' => $matchingLocations]); $tmp = array(); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $tmp[(int)$row['locationid']][$row['setting']] = $row; // Put whole row so we have value and displayvalue } // Callback for pretty printing |