mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12324] Correctly create di container if config/ is missing from update/
This commit is contained in:
Joas Schilling
2014-03-30 13:23:07 +02:00
parent 99553183ab 3e909711d2
commit c882c40276
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/install/install_update.php
View File

@@ -70,7 +70,14 @@ class install_update extends module
$request->enable_super_globals();
// Create a normal container now
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');