makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
commit c882c40276
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
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
$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');