diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-21 21:52:48 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-21 21:52:48 +0200 |
| commit | 51561ed538450d0e3d8392f3073004751e0b03f1 (patch) | |
| tree | e56c4a40c07da1a09632cfd313d655f5d1fd9c8b /phpBB/phpbb/controller/provider.php | |
| parent | bd86dea16c2f2d0d8ac6677777d612480186764a (diff) | |
| download | forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.gz forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.bz2 forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.xz forums-51561ed538450d0e3d8392f3073004751e0b03f1.zip | |
[ticket/11948] Allow resource importing for routing
PHPBB3-11948
Diffstat (limited to 'phpBB/phpbb/controller/provider.php')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 7ea0c973fe..048ca72084 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -56,8 +56,7 @@ class provider // because the finder cannot find it $this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder ->directory('config') - ->prefix('routing') - ->suffix('.yml') + ->suffix('routing.yml') ->find() )); @@ -75,8 +74,8 @@ class provider $routes = new RouteCollection; foreach ($this->routing_files as $file_path) { - $loader = new YamlFileLoader(new FileLocator(dirname($base_path . $file_path))); - $routes->addCollection($loader->load(basename($file_path))); + $loader = new YamlFileLoader(new FileLocator($base_path)); + $routes->addCollection($loader->load($file_path)); } return $routes; |