Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
This commit is contained in:
Joas Schilling 2014-09-07 12:43:23 +02:00
commit 043a66faaa

View file

@ -56,6 +56,8 @@ if (isset($_GET['avatar']))
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register(); $phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container // Set up container
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container(); $phpbb_container = $phpbb_container_builder->get_container();