From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 8 Jul 2020 08:07:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~226
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/383fa4f34fae75a73fd892486f6e4b809467321f?hp=054ea58df11dc3f82563b44d9e1f3a46198b1de7

Merge remote-tracking branch 'upstream/master'
---

diff --git a/cmake/website.tmpl b/cmake/website.tmpl
index 8692280d..8b946584 100755
--- a/cmake/website.tmpl
+++ b/cmake/website.tmpl
@@ -1,3 +1,5 @@
 <?php
+@define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
 require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
+
 require_once(CONST_BasePath.'/@script_source@');
diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 16c48729..0ffb9f35 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -707,9 +707,8 @@ class SetupFunctions
 @define('CONST_BasePath', '".CONST_BasePath."');
 if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
 
-@define('CONST_Debug', ". (CONST_Debug? 'true' : 'false').");
 @define('CONST_Database_DSN', '".CONST_Database_DSN."'); // or add ;host=...;port=...;user=...;password=...
-@define('CONST_Default_Language', ".(CONST_Default_Language ? 'true' : 'false').");
+@define('CONST_Default_Language', ".(CONST_Default_Language ? ("'".CONST_Default_Language."'") : 'false').");
 @define('CONST_Default_Lat', ".CONST_Default_Lat.");
 @define('CONST_Default_Lon', ".CONST_Default_Lon.");
 @define('CONST_Default_Zoom', ".CONST_Default_Zoom.");
diff --git a/settings/defaults.php b/settings/defaults.php
index f5220cd0..7a7a1e6f 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -3,10 +3,8 @@
 @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);
 
 // General settings
-@define('CONST_Debug', false);
 @define('CONST_Database_DSN', 'pgsql:dbname=nominatim'); // or add ;host=...;port=...;user=...;password=...
 @define('CONST_Database_Web_User', 'www-data');
 @define('CONST_Database_Module_Path', CONST_InstallPath.'/module');