Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / init.php

diff --git a/lib/init.php b/lib/init.php
index db984ef8c4c893bac16f2b42680cb5845f85b78f..d21880715abcbe8f91429c2effb973d603de768e 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,14 +1,9 @@
 <?php
 
 <?php
 

-       @define('CONST_BasePath', dirname(dirname(__FILE__)));
+require_once(CONST_BasePath.'/lib/lib.php');
+require_once(CONST_BasePath.'/lib/db.php');

 
 

-       require_once('settings/settings.php');
-       require_once(CONST_BasePath.'/lib/lib.php');
-       require_once(CONST_BasePath.'/lib/leakybucket.php');
-       require_once(CONST_BasePath.'/lib/db.php');
-
-       if (get_magic_quotes_gpc())
-       {
-               echo "Please disable magic quotes in your php.ini configuration\n";
-               exit;
-       }
+if (get_magic_quotes_gpc()) {
+    echo "Please disable magic quotes in your php.ini configuration\n";
+    exit;
+}