Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / init.php

diff --git a/lib/init.php b/lib/init.php
index 17f262c339324f743bbc464a3c52cf03d5f777da..0bd23e31cfe57ffb1376b8025574efd738f22a1e 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,13 +1,9 @@
 <?php
 
-       @define('CONST_BasePath', dirname(dirname(__FILE__)));
+require_once(CONST_BasePath.'/lib/lib.php');
+require_once(CONST_BasePath.'/lib/DB.php');
 
-       require_once(CONST_BasePath.'/settings/settings.php');
-       require_once(CONST_BasePath.'/lib/lib.php');
-       require_once(CONST_BasePath.'/lib/db.php');
-
-       if (get_magic_quotes_gpc())
-       {
-               echo "Please disable magic quotes in your php.ini configuration";
-               exit;
-       }
+if (get_magic_quotes_gpc()) {
+    echo "Please disable magic quotes in your php.ini configuration\n";
+    exit;
+}