diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-27 20:45:31 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:17 +0200 |
| commit | f87e76b9109fa4da3d4c78f191cfd8889f1da1bb (patch) | |
| tree | 3c577c58dbdec2e9eb6aaa05dd019ff5dae0c751 | |
| parent | 78648514fa8b847cfb63cd4b5432d3fa73dd106f (diff) | |
| download | forums-f87e76b9109fa4da3d4c78f191cfd8889f1da1bb.tar forums-f87e76b9109fa4da3d4c78f191cfd8889f1da1bb.tar.gz forums-f87e76b9109fa4da3d4c78f191cfd8889f1da1bb.tar.bz2 forums-f87e76b9109fa4da3d4c78f191cfd8889f1da1bb.tar.xz forums-f87e76b9109fa4da3d4c78f191cfd8889f1da1bb.zip | |
[ticket/12775] Update phpBB/download/file.php
PHPBB3-12775
| -rw-r--r-- | phpBB/download/file.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index abafeee667..636a73a95f 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -38,7 +38,6 @@ else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT' if (isset($_GET['avatar'])) { require($phpbb_root_path . 'includes/startup.' . $phpEx); - require($phpbb_root_path . 'config.' . $phpEx); if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) { @@ -49,7 +48,6 @@ if (isset($_GET['avatar'])) require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); - require($phpbb_root_path . 'includes/functions_container.' . $phpEx); require($phpbb_root_path . 'includes/functions_download' . '.' . $phpEx); require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); @@ -61,8 +59,12 @@ if (isset($_GET['avatar'])) phpbb_load_extensions_autoloaders($phpbb_root_path); + $phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx); + extract($phpbb_config_php_handler->get_all()); + // Set up container - $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); + $phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); + $phpbb_container = $phpbb_container_factory->get_container(); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); |