diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index c5dbb35..921db9b 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -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; diff --git a/src/Pecee/SimpleRouter/RouterGroup.php b/src/Pecee/SimpleRouter/RouterGroup.php index 2283744..f3c0ed4 100644 --- a/src/Pecee/SimpleRouter/RouterGroup.php +++ b/src/Pecee/SimpleRouter/RouterGroup.php @@ -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; + } + } \ No newline at end of file