From 2d57b45c7bf098053cf2194d21e73acde3e36aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sun, 6 Nov 2016 09:04:05 +0100 Subject: [PATCH] Fixed urls not being visible --- src/Pecee/SimpleRouter/RouterBase.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index 248205c..e618d94 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -85,16 +85,21 @@ class RouterBase { $this->currentRoute = $route; - if($route instanceof RouterGroup && is_callable($route->getCallback()) && $route->matchRoute($this->request)) { + if($route instanceof RouterGroup && is_callable($route->getCallback())) { - $group = $route; + $route->renderRoute($this->request); - $group->renderRoute($this->request); - $mergedSettings = array_merge($settings, $group->getMergeableSettings()); + if($route->matchRoute($this->request)) { + + $group = $route; + + $mergedSettings = array_merge($settings, $group->getMergeableSettings()); + + // Add ExceptionHandler + if ($group->getExceptionHandler() !== null) { + $this->exceptionHandlers[] = $route; + } - // Add ExceptionHandler - if($group->getExceptionHandler() !== null) { - $this->exceptionHandlers[] = $route; } }