mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-21 18:44:37 +02:00
[ticket/11574] Try to load updated service.yml before the default one
PHPBB3-11574
This commit is contained in:
@ -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');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user