diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-20 00:00:39 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-20 00:02:15 +0200 |
| commit | bd86dea16c2f2d0d8ac6677777d612480186764a (patch) | |
| tree | 25b45e5e3d0e93c2cd8690cecdaefe3f6d84c523 /phpBB/phpbb/controller | |
| parent | d45582d32afede64c6a9fa18a76eff6a17544043 (diff) | |
| download | forums-bd86dea16c2f2d0d8ac6677777d612480186764a.tar forums-bd86dea16c2f2d0d8ac6677777d612480186764a.tar.gz forums-bd86dea16c2f2d0d8ac6677777d612480186764a.tar.bz2 forums-bd86dea16c2f2d0d8ac6677777d612480186764a.tar.xz forums-bd86dea16c2f2d0d8ac6677777d612480186764a.zip | |
[ticket/11948] Use basename and dirname
PHPBB3-11948
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/provider.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 683253fdf8..7ea0c973fe 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -75,12 +75,8 @@ class provider $routes = new RouteCollection; foreach ($this->routing_files as $file_path) { - $path_info = explode('/', $file_path); - $file_name = array_pop($path_info); - $path = implode('/', $path_info) . '/'; - - $loader = new YamlFileLoader(new FileLocator($base_path . $path)); - $routes->addCollection($loader->load($file_name)); + $loader = new YamlFileLoader(new FileLocator(dirname($base_path . $file_path))); + $routes->addCollection($loader->load(basename($file_path))); } return $routes; |