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();