From 31843ecd8c5b5d3b95d9d1775213fe22a93c8d2b Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 15 Nov 2012 05:00:24 +0100 Subject: [PATCH 1/2] [ticket/11200] Make cache available during container construction Fixes fatal errors in the dbal. PHPBB3-11200 --- phpBB/includes/functions_container.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 1763d1082a..cbd0fe15b0 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -84,8 +84,11 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb $tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); $tmp_container->compile(); + $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); From f2cffd6a6ce72fd5d3a60c734623ea3c1f051071 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 15 Nov 2012 08:50:04 -0500 Subject: [PATCH 2/2] [ticket/11200] Add a reminder comment. PHPBB3-11200 --- phpBB/includes/functions_container.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index cbd0fe15b0..843207db84 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -84,6 +84,8 @@ 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();