diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-12 15:40:49 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:57:57 +0200 |
| commit | 1dea0286a48b4bac6702aad673e13e281690adfb (patch) | |
| tree | cf72c8d5e82646bfc3d2c79d3b726f4e4529c940 /phpBB/install | |
| parent | 6c52fae750ed2955b8c0d737e72f101f4d6f2e3a (diff) | |
| download | forums-1dea0286a48b4bac6702aad673e13e281690adfb.tar forums-1dea0286a48b4bac6702aad673e13e281690adfb.tar.gz forums-1dea0286a48b4bac6702aad673e13e281690adfb.tar.bz2 forums-1dea0286a48b4bac6702aad673e13e281690adfb.tar.xz forums-1dea0286a48b4bac6702aad673e13e281690adfb.zip | |
[ticket/11574] Use alternate DI config file for updater
PHPBB3-11574
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index de7f4f202e..b0e28958ac 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -121,9 +121,12 @@ $phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includ $phpbb_class_loader->register(); // Set up container (must be done here because extensions table may not exist) +$other_config_path = $phpbb_root_path . 'install/update/new/config'; +$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path; + $container_extensions = array( new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), - new phpbb_di_extension_core($phpbb_root_path), + new phpbb_di_extension_core($config_path), ); $container_passes = array( new phpbb_di_pass_collection_pass(), |