reinstate NOMINATIM_SETTINGS variable

Move sourcing of this script to settings.php so that
it is loaded before anything else.

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index e5a650fc1a49ebb9e01aa73dcbf187b26f7a90d1..274256a642e96bd58339dec1f50de75d9ae1e636 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,9 +1,4 @@
 <?php
-       if (file_exists(getenv('NOMINATIM_SETTINGS')))
-       {
-               require_once(getenv('NOMINATIM_SETTINGS'));
-       }
-
        require_once('init.php');
        require_once('cmd.php');
 

diff --git a/settings/settings.php b/settings/settings.php
index d48aff7340192b3b9ad4038686e06cd6324545f9..ea664683adc02d9606b71aa28888b45735dc8cbd 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,6 +1,7 @@
 <?php
        @define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
        @define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
+       if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
        if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
        if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);