diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 23:19:51 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 23:19:51 -0600 |
| commit | 61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e (patch) | |
| tree | 210fe8026aecc70a45d48e52c58ef77d43b85787 /phpBB/includes/di/extension/ext.php | |
| parent | 570c5ad3c08378f377385aaff7d3810ccb8db3ff (diff) | |
| parent | b453f359ff6dab58b0eaf94548c4e58110fb02ec (diff) | |
| download | forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.gz forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.bz2 forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.xz forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/config/services.yml
phpBB/index.php
Diffstat (limited to 'phpBB/includes/di/extension/ext.php')
| -rw-r--r-- | phpBB/includes/di/extension/ext.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/di/extension/ext.php b/phpBB/includes/di/extension/ext.php index e76c543ee1..7d9b433751 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(phpbb_real_path($path . '/config'))); + $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($path . '/config'))); $loader->load('services.yml'); } } |