geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from skipperbent/v2

Browse Source 
V2
This commit is contained in:
Simon Sessingø
2016-11-19 07:02:34 +02:00
committed by GitHub
parent 961a4d0e94 914ec9d1b7
commit 4dde51e833
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+4 -2
View File
@@ -137,6 +137,7 @@ class RouterBase
protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), RouterEntry $parent = null) {
$mergedSettings = [];
$mergedPrefixes = [];
// Loop through each route-request
/* @var $route RouterEntry */
@@ -146,6 +147,7 @@ class RouterBase
if ($parent !== null) {
$route->setParent($parent);
$mergedPrefixes = [];
}
if ($route instanceof ILoadableRoute) {
@@ -159,7 +161,7 @@ class RouterBase
} elseif ($route instanceof RouterGroup) {
if ($route->getPrefix() !== null && trim($route->getPrefix(), '/') !== '') {
$prefixes[] = trim($route->getPrefix(), '/');
$mergedPrefixes[] = trim($route->getPrefix(), '/');
}
if ($route->getCallback() !== null && is_callable($route->getCallback())) {
@@ -186,7 +188,7 @@ class RouterBase
$this->backStack = array();
// Route any routes added to the backstack
$this->processRoutes($backStack, $mergedSettings, $prefixes, $route);
$this->processRoutes($backStack, $mergedSettings, $mergedPrefixes, $route);
}
}
}