makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11574] Try to load updated service.yml before the default one

Browse source 
PHPBB3-11574
This commit is contained in:
Joas Schilling 2013-06-10 13:48:21 +02:00
parent d72b5aaf1b
commit 06caac0444
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/di/extension/core.php
View file

@ -51,8 +51,16 @@ class phpbb_di_extension_core extends Extension
*/ */
public function load(array $config, ContainerBuilder $container) public function load(array $config, ContainerBuilder $container)
{ {
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config'))); if (file_exists($this->root_path . 'install/update/new/config/services.yml'))
$loader->load('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');
}
} }
/** /**