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

[BUGFIX] Only render group if prefix matches.

Browse Source
This commit is contained in:
Simon Sessingø
2016-03-16 19:57:54 +01:00
parent c4fcf750d4
commit db78135d19
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+1 -7
View File
@@ -86,7 +86,7 @@ class RouterBase {
$this->currentRoute = $route; $this->currentRoute = $route;
if($route instanceof RouterGroup && is_callable($route->getCallback())) { if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
$group = $route; $group = $route;
$route->renderRoute($this->request); $route->renderRoute($this->request);
$mergedSettings = array_merge($route->getMergeableSettings(), $settings); $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
@@ -126,12 +126,6 @@ class RouterBase {
$route = $this->controllerUrlMap[$i]; $route = $this->controllerUrlMap[$i];
if($route->getGroup() !== null) {
if($route->getGroup()->matchDomain($this->request) === false) {
continue;
}
}
$routeMatch = $route->matchRoute($this->request); $routeMatch = $route->matchRoute($this->request);
if($routeMatch) { if($routeMatch) {
src/Pecee/SimpleRouter/RouterGroup.php
+6 -1
View File
@@ -66,7 +66,12 @@ class RouterGroup extends RouterEntry {
} }
public function matchRoute(Request $request) { public function matchRoute(Request $request) {
return null; // Skip if prefix doesn't match
if($this->getPrefix() !== null && stripos($request->getUri(), $this->getPrefix()) === false) {
return false;
}
return $this->matchDomain($request);
} }
public function setExceptionHandler($class) { public function setExceptionHandler($class) {