diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-08-24 22:32:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-08-24 22:32:55 +0200 |
| commit | dde16e4b2a8e93e184d03922ebeae155a95d1ee2 (patch) | |
| tree | 77051e6545c9765aea5e93ea10ca19f10662b285 /phpBB/phpbb/controller | |
| parent | 8144de3792f078e5ed1929bb05c45c43bf4c5f79 (diff) | |
| parent | 9fc5073540fe23c0b32d6eac667560f1b7204b50 (diff) | |
| download | forums-dde16e4b2a8e93e184d03922ebeae155a95d1ee2.tar forums-dde16e4b2a8e93e184d03922ebeae155a95d1ee2.tar.gz forums-dde16e4b2a8e93e184d03922ebeae155a95d1ee2.tar.bz2 forums-dde16e4b2a8e93e184d03922ebeae155a95d1ee2.tar.xz forums-dde16e4b2a8e93e184d03922ebeae155a95d1ee2.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13008] Add functionnal test
[ticket/13008] Use an absolute path with the FileLocator for the routing files
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index fffd4f0428..7e26848290 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -73,7 +73,7 @@ class provider $this->routes = new RouteCollection; foreach ($this->routing_files as $file_path) { - $loader = new YamlFileLoader(new FileLocator($base_path)); + $loader = new YamlFileLoader(new FileLocator(phpbb_realpath($base_path))); $this->routes->addCollection($loader->load($file_path)); } |