makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11152] Use realpath in container extensions consistently

Browse source 
PHPBB-11152
This commit is contained in:
Igor Wiedler 2012-11-11 16:28:28 +01:00
parent 3e4d3761fd
commit 09781a96bc
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,16 +29,16 @@ class phpbb_di_extension_core extends Extension
* phpBB Root path * phpBB Root path
* @var string * @var string
*/ */
protected $phpbb_root_path; protected $root_path;
/** /**
* Constructor * Constructor
* *
* @param string $phpbb_root_path Root path * @param string $root_path Root path
*/ */
public function __construct($phpbb_root_path) public function __construct($root_path)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->root_path = $root_path;
} }
/** /**
@ -51,9 +51,9 @@ class phpbb_di_extension_core extends Extension
*/ */
public function load(array $config, ContainerBuilder $container) public function load(array $config, ContainerBuilder $container)
{ {
if (file_exists($this->phpbb_root_path . 'config/services.yml')) if (file_exists($this->root_path . 'config/services.yml'))
{ {
$loader = new YamlFileLoader($container, new FileLocator(realpath($this->phpbb_root_path . 'config'))); $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
$loader->load('services.yml'); $loader->load('services.yml');
} }
} }

2
phpBB/includes/di/extension/ext.php
View file

@ -49,7 +49,7 @@ class phpbb_di_extension_ext extends Extension
{ {
if (file_exists($path . '/config/services.yml')) if (file_exists($path . '/config/services.yml'))
{ {
$loader = new YamlFileLoader($container, new FileLocator($path . '/config')); $loader = new YamlFileLoader($container, new FileLocator(phpbb_real_path($path . '/config')));
$loader->load('services.yml'); $loader->load('services.yml');
} }
} }