diff options
author | Nils Adermann <naderman@naderman.de> | 2013-04-25 04:02:42 -0700 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-04-25 04:02:42 -0700 |
commit | ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d (patch) | |
tree | 8c03cd860091ae900ecf880bb7ed64f834a319f4 /phpBB/install | |
parent | 7b144bbff2968b8897359b7954f048ce5eb78455 (diff) | |
parent | 4becf85f5274bbe861da05917ab466eb072ea600 (diff) | |
download | forums-ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d.tar forums-ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d.tar.gz forums-ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d.tar.bz2 forums-ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d.tar.xz forums-ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d.zip |
Merge pull request #1368 from EXreaction/ticket/11479
[ticket/11479] Fix install/update (rebuild container)
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/install_update.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index bfceed6b17..aa1bd0fa35 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -72,7 +72,13 @@ 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_default_container($phpbb_root_path, $phpEx); + + // Writes into global $cache + $cache = $phpbb_container->get('cache'); $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; |