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/includes/functions_container.php | |
| 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/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 106b7d75cc..d302b75350 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -53,7 +53,10 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext) */ function phpbb_create_install_container($phpbb_root_path, $php_ext) { - $core = new phpbb_di_extension_core($phpbb_root_path); + $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 . 'config'; + + $core = new phpbb_di_extension_core($config_path); $container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext); $container->setParameter('core.root_path', $phpbb_root_path); @@ -175,7 +178,7 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext) return phpbb_create_dumped_container_unless_debug( array( new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext), - new phpbb_di_extension_core($phpbb_root_path), + new phpbb_di_extension_core($phpbb_root_path . 'config'), ), array( new phpbb_di_pass_collection_pass(), |