diff options
| author | Carlo <carlo@phpbbitalia.net> | 2014-07-17 00:05:33 +0200 |
|---|---|---|
| committer | Carlo <carlo@phpbbitalia.net> | 2014-07-17 00:05:33 +0200 |
| commit | 7f4d4250066eadb6badd43c4ce1b8f2f84e083cf (patch) | |
| tree | dfc133b1e85a939a7a5464197f16ce311a31eeb7 /phpBB/bin | |
| parent | a4972bb338f06c6b7fbeea22869b3c3b106becf7 (diff) | |
| download | forums-7f4d4250066eadb6badd43c4ce1b8f2f84e083cf.tar forums-7f4d4250066eadb6badd43c4ce1b8f2f84e083cf.tar.gz forums-7f4d4250066eadb6badd43c4ce1b8f2f84e083cf.tar.bz2 forums-7f4d4250066eadb6badd43c4ce1b8f2f84e083cf.tar.xz forums-7f4d4250066eadb6badd43c4ce1b8f2f84e083cf.zip | |
[ticket/12685] Setup class loader for extensions only if not in safe mode
PHPBB3-12685
Diffstat (limited to 'phpBB/bin')
| -rwxr-xr-x | phpBB/bin/phpbbcli.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php index d86ec6d8f8..89bad94184 100755 --- a/phpBB/bin/phpbbcli.php +++ b/phpBB/bin/phpbbcli.php @@ -37,9 +37,6 @@ require($phpbb_root_path . 'includes/functions.' . $phpEx); require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); -$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); -$phpbb_class_loader_ext->register(); - $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx); $phpbb_container_builder->set_dump_container(false); @@ -50,6 +47,12 @@ if ($input->hasParameterOption(array('--safe-mode'))) $phpbb_container_builder->set_use_extensions(false); $phpbb_container_builder->set_dump_container(false); } +else +{ + $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); + $phpbb_class_loader_ext->register(); + phpbb_load_extensions_autoloaders($phpbb_root_path); +} $phpbb_container = $phpbb_container_builder->get_container(); $phpbb_container->get('request')->enable_super_globals(); |