Merge branch 'stable'

This commit is contained in:
following
2013-03-23 22:25:11 +01:00
6 changed files with 14 additions and 8 deletions

View File

@@ -37,7 +37,6 @@ function __autoload($class_name)
fix_magic_quotes_gpc();
// set options
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'config2/settings-dist.inc.php');
require_once($opt['rootpath'] . 'config2/settings.inc.php');
@@ -82,6 +81,7 @@ function __autoload($class_name)
$tpl = new OcSmarty();
// include all we need
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'lib2/logic/geomath.class.php');
require_once($opt['rootpath'] . 'lib2/error.inc.php');
require_once($opt['rootpath'] . 'lib2/util.inc.php');