diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
| commit | d2187424da6ff2e0d4a69a6e21bac7e92f68335a (patch) | |
| tree | ee099178886dd3a6e737f2dee08bd6312bf25ce1 /phpBB/download/file.php | |
| parent | 7948aaa78ed7e543a0773ee1a858ef45f5e5a5bf (diff) | |
| parent | 9c28470ad7b45c10ce3a32065650e4b17f9f27ea (diff) | |
| download | forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.gz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.bz2 forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.xz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/common.php
phpBB/config/services.yml
Diffstat (limited to 'phpBB/download/file.php')
| -rw-r--r-- | phpBB/download/file.php | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 7ed53d54b6..79f53245b9 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -48,18 +48,31 @@ if (isset($_GET['avatar'])) require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); 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); - $phpbb_container = new ContainerBuilder(); - $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config')); - $loader->load('services.yml'); - - $processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx); - $processor->process($phpbb_container); - - $phpbb_class_loader = $phpbb_container->get('class_loader'); - $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); + // Setup class loader first + $phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx"); + $phpbb_class_loader->register(); + $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx"); + $phpbb_class_loader_ext->register(); + + // Set up container + $phpbb_container = phpbb_create_dumped_container_unless_debug( + array( + new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), + new phpbb_di_extension_core($phpbb_root_path), + ), + array( + new phpbb_di_pass_collection_pass(), + ), + $phpbb_root_path, + $phpEx + ); + + $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); + $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); // set up caching $cache = $phpbb_container->get('cache'); @@ -85,13 +98,6 @@ if (isset($_GET['avatar'])) $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader'); - $ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor')); - foreach ($ids as $id) - { - $processor = $phpbb_container->get($id); - $processor->process($phpbb_container); - } - // worst-case default $browser = strtolower($request->header('User-Agent', 'msie 6.0')); @@ -392,7 +398,7 @@ else $disallowed[$attach['extension']] = $attach['extension']; continue; } - + $prefix = ''; if ($topic_id) { |