safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

reinstate NOMINATIM_SETTINGS variable

Browse Source 
Move sourcing of this script to settings.php so that
it is loaded before anything else.
This commit is contained in:
Sarah Hoffmann
2016-03-24 22:06:54 +01:00
parent a50bf1c944
commit 7090604de7
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/init-cmd.php
View File

@@ -1,9 +1,4 @@
<?php <?php
if (file_exists(getenv('NOMINATIM_SETTINGS')))
{
require_once(getenv('NOMINATIM_SETTINGS'));
}
require_once('init.php'); require_once('init.php');
require_once('cmd.php'); require_once('cmd.php');

1
settings/settings.php
View File

@@ -1,6 +1,7 @@
<?php <?php
@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@'); @define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
@define('CONST_InstallPath', '@CMAKE_BINARY_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 (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true); if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);