X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/992d3faac81baa105c92874a412ebf5389c0ca14..06d89e1d470c2b95dee7925dca25643a6afc9882:/lib/lib.php

diff --git a/lib/lib.php b/lib/lib.php
index aeba499b..74abe6a2 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -7,16 +7,16 @@ function loadSettings($sProjectDir)
     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();
+    $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 
     if (file_exists($sProjectDir.'/.env')) {
         $dotenv->load($sProjectDir.'/.env');
     }
-    $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 
 function getSetting($sConfName, $sDefault = null)
 {
-    $sValue = $_ENV['NOMINATIM_'.$sConfName];
+    $sValue = $_SERVER['NOMINATIM_'.$sConfName];
 
     if ($sDefault !== null && !$sValue) {
         return $sDefault;