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] Optimisations + bugfixes.

Browse Source
This commit is contained in:
Simon Sessingø
2015-12-10 04:12:44 +01:00
parent 3ba2cec8af
commit 59956d5fca
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+3 -1
View File
@@ -80,11 +80,13 @@ class RouterBase {
}
$this->currentRoute = $route;
if($route instanceof RouterGroup && is_callable($route->getCallback())) {
$route->renderRoute($this->request);
$activeGroup = $route;
$mergedSettings = array_merge($settings, $route->getMergeableSettings());
$mergedSettings = array_merge($route->getMergeableSettings(), $settings);
}
$this->currentRoute = null;
if(count($this->backstack)) {