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

[BUGFIX] Fixed nested groups not merging settings to routes

Browse Source
This commit is contained in:
Simon Sessingø
2016-04-07 01:38:03 +02:00
parent 4d58fbf7b5
commit 6e102711a8
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+1 -1
View File
@@ -91,7 +91,7 @@ class RouterBase {
if($route instanceof RouterGroup && is_callable($route->getCallback())) {
$group = $route;
$route->renderRoute($this->request);
$mergedSettings = array_merge($route->getMergeableSettings(), $settings);
$mergedSettings = array_merge($settings, $route->getMergeableSettings());
}
$this->currentRoute = null;
src/Pecee/SimpleRouter/RouterGroup.php
+14
View File
@@ -88,4 +88,18 @@ class RouterGroup extends RouterEntry {
return $this->domain;
}
/**
* @param array $settings
* @return self
*/
public function addSettings(array $settings = null) {
if(isset($settings['namespace'])) {
unset($settings['namespace']);
}
if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings);
}
return $this;
}
}