From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 24 Mar 2016 21:06:54 +0000 (+0100)
Subject: reinstate NOMINATIM_SETTINGS variable
X-Git-Tag: v3.0.0~193
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7090604de77517b593707aca13574f460848c9cc

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 e5a650fc..274256a6 100644
--- 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 d48aff73..ea664683 100644
--- 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);