aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-06-25 14:38:53 +0200
committerNils Adermann <naderman@naderman.de>2010-07-05 15:40:46 +0200
commitdea1d660fb63b07451f1a43310de359251462644 (patch)
treed4ba1c6e3ce05c3c545cc8ffaaddce56ee03db59 /phpBB/common.php
parent22c3041e128bd2d10d37672bdf5c7c1eb4112b12 (diff)
downloadforums-dea1d660fb63b07451f1a43310de359251462644.tar
forums-dea1d660fb63b07451f1a43310de359251462644.tar.gz
forums-dea1d660fb63b07451f1a43310de359251462644.tar.bz2
forums-dea1d660fb63b07451f1a43310de359251462644.tar.xz
forums-dea1d660fb63b07451f1a43310de359251462644.zip
[feature/auto-loading] Added autoloader to common and ensured compatability
The autoloader is registered in install without caching, since caching is set up during installation. This provides the same functionality, performance is not a concern during installation anyway. In common.php the autoloader is instantiated after the cache is initialised and is started with the standard cache backend used for other cached values. A few places in the code using class_exists had to be updated to explicitly avoid autoloading, since they are used to check whether a file needs to be included which does not (yet) follow the naming scheme the autoloader follows. PHPBB3-9682
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 9b6913e95f..6cc7abf118 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -188,6 +188,7 @@ if (!empty($load_extensions) && function_exists('dl'))
}
// Include files
+require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/template.' . $phpEx);
@@ -211,6 +212,9 @@ $template = new template();
$cache = new cache();
$db = new $sql_db();
+$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache);
+$class_loader->register();
+
// Connect to DB
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false);