Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / init.php

diff --git a/lib/init.php b/lib/init.php
index 67efdbfdf6edb3c8894f7d8a487adfde7d193633..cc50aaf340102854c3090297d9dc4c37e51ea79a 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,14 +1,4 @@
 <?php
 
 <?php
 

-       @define('CONST_BasePath', dirname(dirname(__FILE__)));
-
-       require_once(CONST_BasePath.'/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;
-       }
+require_once(CONST_LibDir.'/lib.php');
+require_once(CONST_LibDir.'/DB.php');