diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:24:09 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:24:09 -0500 |
| commit | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (patch) | |
| tree | bc63376c5ab01203cdbdbb0ed44d1af511a1afd1 /phpBB/common.php | |
| parent | 53c4257bfa68ca3962c2b47a6ba15a060861124b (diff) | |
| parent | 21eb8d842bc634a92f04c37e5de22c4c5692052d (diff) | |
| download | forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.gz forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.bz2 forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.xz forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.zip | |
Merge PR #1175 branch 'igorw/ticket/11306' into develop
# By Igor Wiedler
# Via Igor Wiedler
* igorw/ticket/11306:
[ticket/11306] Add docblocks to all container related functions
[ticket/11306] Introduce phpbb_create_default_container
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 3e0b8e324b..2ed55dfa95 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -87,18 +87,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat $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(), - new phpbb_di_pass_kernel_pass(), - ), - $phpbb_root_path, - $phpEx -); +$phpbb_container = phpbb_create_default_container($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')); |