diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-15 21:38:47 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 15:42:46 +0200 |
| commit | 96209e022477d97b581b79cabace4caddd19501b (patch) | |
| tree | 660134bf3d3bc3a3ab50a222e789aafea5379b4a /phpBB/common.php | |
| parent | 989bd9cde7314024999f5b92fc2ff4572b9ac937 (diff) | |
| download | forums-96209e022477d97b581b79cabace4caddd19501b.tar forums-96209e022477d97b581b79cabace4caddd19501b.tar.gz forums-96209e022477d97b581b79cabace4caddd19501b.tar.bz2 forums-96209e022477d97b581b79cabace4caddd19501b.tar.xz forums-96209e022477d97b581b79cabace4caddd19501b.zip | |
[feature/extension-manager] The class loader no longer knows about extensions
Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.
PHPBB3-10323
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index cc33b29a09..61817972f9 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -96,13 +96,16 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); // Setup class loader first -$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx); -$class_loader->register(); +$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx"); +$phpbb_class_loader_ext->register(); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx"); +$phpbb_class_loader->register(); // set up caching $cache_factory = new phpbb_cache_factory($acm_type); $cache = $cache_factory->get_service(); -$class_loader->set_cache($cache->get_driver()); +$phpbb_class_loader_ext->set_cache($cache->get_driver()); +$phpbb_class_loader->set_cache($cache->get_driver()); // Instantiate some basic classes $request = new phpbb_request(); |