diff options
Diffstat (limited to 'phpBB/phpbb/di')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 3 | 
2 files changed, 4 insertions, 2 deletions
| diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 125ae28e9b..2a410db9bd 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -192,7 +192,8 @@ class container_builder  				}  			} -			$loader = new YamlFileLoader($this->container, new FileLocator(phpbb_realpath($this->get_config_path()))); +			$filesystem = new \phpbb\filesystem\filesystem(); +			$loader = new YamlFileLoader($this->container, new FileLocator($filesystem->realpath($this->get_config_path())));  			$loader->load($this->container->getParameter('core.environment') . '/config.yml');  			$this->inject_custom_parameters(); diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 451efc8e35..c71dc61280 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -50,7 +50,8 @@ class core extends Extension  	 */  	public function load(array $configs, ContainerBuilder $container)  	{ -		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path))); +		$filesystem = new \phpbb\filesystem\filesystem(); +		$loader = new YamlFileLoader($container, new FileLocator($filesystem->realpath($this->config_path)));  		$loader->load($container->getParameter('core.environment') . '/container/environment.yml');  		$config = $this->getConfiguration($configs, $container); | 
