diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-30 13:22:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-30 13:22:44 +0200 |
| commit | 3e909711d2b8115f6a53a46be1e702a7fdc8a0c0 (patch) | |
| tree | 7b87ae50a83f625ded793ef605edb144419e3754 | |
| parent | 8442f2239db16953585b46ffca5e944d66750c8b (diff) | |
| parent | df5761b370e03abde999be8b0dd895b1e61660d9 (diff) | |
| download | forums-3e909711d2b8115f6a53a46be1e702a7fdc8a0c0.tar forums-3e909711d2b8115f6a53a46be1e702a7fdc8a0c0.tar.gz forums-3e909711d2b8115f6a53a46be1e702a7fdc8a0c0.tar.bz2 forums-3e909711d2b8115f6a53a46be1e702a7fdc8a0c0.tar.xz forums-3e909711d2b8115f6a53a46be1e702a7fdc8a0c0.zip | |
Merge remote-tracking branch 'Elsensee/ticket/12324' into develop-ascraeus
* Elsensee/ticket/12324:
[ticket/12324] Correctly create di container if config/ is missing from update/
| -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'); |