diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-15 09:01:19 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-15 09:01:19 -0500 |
| commit | f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b (patch) | |
| tree | 54cb928ee8d14026ec5f2181dd34629618e1c767 | |
| parent | 56b7ba2085ce603005127443cfb9c93ae05fcebb (diff) | |
| parent | f2cffd6a6ce72fd5d3a60c734623ea3c1f051071 (diff) | |
| download | forums-f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b.tar forums-f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b.tar.gz forums-f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b.tar.bz2 forums-f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b.tar.xz forums-f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b.zip | |
Merge PR #1089 branch 'igorw/ticket/11200' into develop
* igorw/ticket/11200:
[ticket/11200] Add a reminder comment.
[ticket/11200] Make cache available during container construction
| -rw-r--r-- | phpBB/includes/functions_container.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 1763d1082a..843207db84 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -84,8 +84,13 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb $tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); $tmp_container->compile(); + // XXX stop writing to global $cache when + // http://tracker.phpbb.com/browse/PHPBB3-11203 is fixed + $GLOBALS['cache'] = $tmp_container->get('cache'); + $installed_exts = $tmp_container->get('ext.manager')->all_enabled(); + // Now pass the enabled extension paths into the ext compiler extension - $extensions[] = new phpbb_di_extension_ext($tmp_container->get('ext.manager')->all_enabled()); + $extensions[] = new phpbb_di_extension_ext($installed_exts); // Create the final container to be compiled and cached $container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); |