[ticket/11948] Use basename and dirname

PHPBB3-11948
This commit is contained in:
Joas Schilling 2013-10-20 00:00:39 +02:00
parent d45582d32a
commit bd86dea16c

View file

@ -75,12 +75,8 @@ class provider
$routes = new RouteCollection; $routes = new RouteCollection;
foreach ($this->routing_files as $file_path) foreach ($this->routing_files as $file_path)
{ {
$path_info = explode('/', $file_path); $loader = new YamlFileLoader(new FileLocator(dirname($base_path . $file_path)));
$file_name = array_pop($path_info); $routes->addCollection($loader->load(basename($file_path)));
$path = implode('/', $path_info) . '/';
$loader = new YamlFileLoader(new FileLocator($base_path . $path));
$routes->addCollection($loader->load($file_name));
} }
return $routes; return $routes;