diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-11 16:28:28 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-11 16:34:41 +0100 |
| commit | 09781a96bc10fd659a4746055762d849905b8b71 (patch) | |
| tree | b0281a610cb81dfcde02f7530a891fb8eaacda9c /phpBB/includes | |
| parent | 3e4d3761fdec878758e43779eab124816596c8aa (diff) | |
| download | forums-09781a96bc10fd659a4746055762d849905b8b71.tar forums-09781a96bc10fd659a4746055762d849905b8b71.tar.gz forums-09781a96bc10fd659a4746055762d849905b8b71.tar.bz2 forums-09781a96bc10fd659a4746055762d849905b8b71.tar.xz forums-09781a96bc10fd659a4746055762d849905b8b71.zip | |
[ticket/11152] Use realpath in container extensions consistently
PHPBB-11152
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/di/extension/core.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/di/extension/ext.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php index 701ae453d1..7dfdd6782a 100644 --- a/phpBB/includes/di/extension/core.php +++ b/phpBB/includes/di/extension/core.php @@ -29,16 +29,16 @@ class phpbb_di_extension_core extends Extension * phpBB Root path * @var string */ - protected $phpbb_root_path; + protected $root_path; /** * 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) { - 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'); } } diff --git a/phpBB/includes/di/extension/ext.php b/phpBB/includes/di/extension/ext.php index 5898989717..e76c543ee1 100644 --- a/phpBB/includes/di/extension/ext.php +++ b/phpBB/includes/di/extension/ext.php @@ -49,7 +49,7 @@ class phpbb_di_extension_ext extends Extension { 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'); } } |