diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-03-29 23:02:00 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-03-29 23:02:37 +0100 |
| commit | df5761b370e03abde999be8b0dd895b1e61660d9 (patch) | |
| tree | 7b87ae50a83f625ded793ef605edb144419e3754 /phpBB/install | |
| parent | 8442f2239db16953585b46ffca5e944d66750c8b (diff) | |
| download | forums-df5761b370e03abde999be8b0dd895b1e61660d9.tar forums-df5761b370e03abde999be8b0dd895b1e61660d9.tar.gz forums-df5761b370e03abde999be8b0dd895b1e61660d9.tar.bz2 forums-df5761b370e03abde999be8b0dd895b1e61660d9.tar.xz forums-df5761b370e03abde999be8b0dd895b1e61660d9.zip | |
[ticket/12324] Correctly create di container if config/ is missing from update/
PHPBB3-12324
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_update.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index cdfb7ecb06..87b7d8d703 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -70,7 +70,14 @@ class install_update extends module $request->enable_super_globals(); // Create a normal container now - $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'install/update/new/config'); + if (file_exists($phpbb_root_path . 'install/update/new/config')) + { + $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'install/update/new/config'); + } + else + { + $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'config'); + } // Writes into global $cache $cache = $phpbb_container->get('cache'); |