X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/433017b9907c8348a48ef1a9fa7669e3d9523f1b..04690ad8c4734c15efc920bc0dab59cf78e3e7cb:/lib/setup/SetupClass.php?ds=sidebyside

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index fd2b83de..92c36bf3 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -42,7 +42,7 @@ class SetupFunctions
             $this->iCacheMemory = getCacheMemoryMB();
         }
 
-        $this->sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_InstallDir.'/module');
+        $this->sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_Default_ModulePath);
         info('module path: ' . $this->sModulePath);
 
         // parse database string
@@ -727,7 +727,7 @@ class SetupFunctions
           'status.php'
         );
 
-        foreach($aScripts as $sScript) {
+        foreach ($aScripts as $sScript) {
             $rFile = fopen(CONST_InstallDir.'/website/'.$sScript, 'w');
 
             fwrite($rFile, "<?php\n\n");
@@ -736,9 +736,6 @@ class SetupFunctions
             fwriteConstDef($rFile, 'LibDir', CONST_LibDir);
             fwriteConstDef($rFile, 'DataDir', CONST_DataDir);
             fwriteConstDef($rFile, 'InstallDir', CONST_InstallDir);
-
-            fwrite($rFile, "if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));\n\n");
-
             fwriteConstDef($rFile, 'Database_DSN', getSetting('DATABASE_DSN'));
             fwriteConstDef($rFile, 'Default_Language', getSetting('DEFAULT_LANGUAGE'));
             fwriteConstDef($rFile, 'Log_DB', getSettingBool('LOG_DB'));