Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / lib / init.php

diff --git a/lib/init.php b/lib/init.php
index 67efdbfdf6edb3c8894f7d8a487adfde7d193633..1d47c98fb2e4a6f652a557af640352c315f1e97a 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,10 +1,6 @@
 <?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/lib.php');

-       require_once(CONST_BasePath.'/lib/leakybucket.php');

        require_once(CONST_BasePath.'/lib/db.php');
 
        if (get_magic_quotes_gpc())
        require_once(CONST_BasePath.'/lib/db.php');
 
        if (get_magic_quotes_gpc())