diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-10 13:48:21 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:57:56 +0200 |
| commit | 06caac044479c3ff41f48157f40e8cb00e3d5e84 (patch) | |
| tree | 7f2218e19d032a6b519933475124f8e3b24588ab | |
| parent | d72b5aaf1bd6d959c2b06e923ab76fc1f370e455 (diff) | |
| download | forums-06caac044479c3ff41f48157f40e8cb00e3d5e84.tar forums-06caac044479c3ff41f48157f40e8cb00e3d5e84.tar.gz forums-06caac044479c3ff41f48157f40e8cb00e3d5e84.tar.bz2 forums-06caac044479c3ff41f48157f40e8cb00e3d5e84.tar.xz forums-06caac044479c3ff41f48157f40e8cb00e3d5e84.zip | |
[ticket/11574] Try to load updated service.yml before the default one
PHPBB3-11574
| -rw-r--r-- | phpBB/includes/di/extension/core.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php index 9c36ba2fc4..d0a3ebdf99 100644 --- a/phpBB/includes/di/extension/core.php +++ b/phpBB/includes/di/extension/core.php @@ -51,8 +51,16 @@ class phpbb_di_extension_core extends Extension */ public function load(array $config, ContainerBuilder $container) { - $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config'))); - $loader->load('services.yml'); + if (file_exists($this->root_path . 'install/update/new/config/services.yml')) + { + $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config'))); + $loader->load('services.yml'); + } + else if (file_exists($this->root_path . 'config/services.yml')) + { + $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config'))); + $loader->load('services.yml'); + } } /** |