diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-04-24 11:26:13 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-04-24 11:26:13 -0500 |
| commit | cc902ddee09c3d516a27c26fbf19af8f772814e6 (patch) | |
| tree | 7802441165c423f421426918b919ceb6dcfcb1a3 | |
| parent | ab628cbdb99eda1c3efbbca7e374f64876800428 (diff) | |
| download | forums-cc902ddee09c3d516a27c26fbf19af8f772814e6.tar forums-cc902ddee09c3d516a27c26fbf19af8f772814e6.tar.gz forums-cc902ddee09c3d516a27c26fbf19af8f772814e6.tar.bz2 forums-cc902ddee09c3d516a27c26fbf19af8f772814e6.tar.xz forums-cc902ddee09c3d516a27c26fbf19af8f772814e6.zip | |
[ticket/11479] Fix install/update (rebuild container)
Code copied from fix in 11305
PHPBB3-11479
| -rw-r--r-- | phpBB/install/install_update.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index bfceed6b17..cf800aefd4 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -72,7 +72,24 @@ class install_update extends module function main($mode, $sub) { global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; - global $request, $phpbb_admin_path, $phpbb_adm_relative_path; + global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container; + + // Create a normal container now + $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 + ); + + // Writes into global $cache + $cache = $phpbb_container->get('cache'); $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; |