aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/index.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/install/index.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/install/index.php')
-rw-r--r--phpBB/install/index.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index eb51ca5fb2..03b19d1c12 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -152,6 +152,7 @@ else
@ini_set('memory_limit', $mem_limit);
// Include essential scripts
+require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
@@ -168,6 +169,9 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
+$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
+$class_loader->register();
+
// Try and load an appropriate language if required
$language = basename(request_var('language', ''));