makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 14:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #1089 branch 'igorw/ticket/11200' into develop

Browse source 
* igorw/ticket/11200:
  [ticket/11200] Add a reminder comment.
  [ticket/11200] Make cache available during container construction
This commit is contained in:
Oleg Pudeyev 2012-11-15 09:01:19 -05:00
commit f16f33c5ed
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_container.php
View file

@ -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 = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
$tmp_container->compile(); $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 // 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 // Create the final container to be compiled and cached
$container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); $container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);