summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/common.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/common.php b/lib/common.php
index ff56b0920..32ef6ea7b 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -30,6 +30,10 @@ define('NOTICES_PER_PAGE', 20);
define_syslog_variables();
+# append our extlib dir as the last-resort place to find libs
+
+set_include_path(array_merge(get_include_path(), array(INSTALLDIR . '/extlib/')));
+
# global configuration object
require_once('PEAR.php');
@@ -101,15 +105,16 @@ $config['db'] =
'db_driver' => 'DB', # XXX: JanRain libs only work with DB
'quote_identifiers' => false);
-require_once(INSTALLDIR.'/config.php');
-
-require_once('Validate.php');
-
if (function_exists('date_default_timezone_set')) {
/* Work internally in UTC */
date_default_timezone_set('UTC');
}
+require_once(INSTALLDIR.'/config.php');
+
+require_once('Validate.php');
+require_once('markdown.php');
+
require_once(INSTALLDIR.'/lib/util.php');
require_once(INSTALLDIR.'/lib/action.php');
require_once(INSTALLDIR.'/lib/theme.php');
@@ -122,5 +127,3 @@ function __autoload($class) {
require_once(INSTALLDIR.'/classes/' . $class . '.php');
}
}
-
-require_once('markdown.php');