From bd86dea16c2f2d0d8ac6677777d612480186764a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 20 Oct 2013 00:00:39 +0200
Subject: [PATCH] [ticket/11948] Use basename and dirname

PHPBB3-11948
---
 phpBB/phpbb/controller/provider.php | 8 ++------
 1 file 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;