geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 20:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122 from skipperbent/development

Browse Source 
Fixed urls in groups not working
This commit is contained in:
Simon Sessingø
2016-11-06 09:04:56 +01:00
committed by GitHub
parent 52034411cf 2d57b45c7b
commit 4a03005c68
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+8 -3
View File
@@ -85,20 +85,25 @@ class RouterBase {
$this->currentRoute = $route; $this->currentRoute = $route;
if($route instanceof RouterGroup && is_callable($route->getCallback()) && $route->matchRoute($this->request)) { if($route instanceof RouterGroup && is_callable($route->getCallback())) {
$route->renderRoute($this->request);
if($route->matchRoute($this->request)) {
$group = $route; $group = $route;
$group->renderRoute($this->request);
$mergedSettings = array_merge($settings, $group->getMergeableSettings()); $mergedSettings = array_merge($settings, $group->getMergeableSettings());
// Add ExceptionHandler // Add ExceptionHandler
if($group->getExceptionHandler() !== null) { if ($group->getExceptionHandler() !== null) {
$this->exceptionHandlers[] = $route; $this->exceptionHandlers[] = $route;
} }
} }
}
$this->currentRoute = null; $this->currentRoute = null;
if(count($this->backStack)) { if(count($this->backStack)) {