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

Updated documentation

Browse Source
This commit is contained in:
Simon Sessingø
2016-11-15 03:55:28 +01:00
parent d5e7a13d89
commit bc14790a67
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+3 -3
View File
@@ -106,7 +106,6 @@ class RouterBase {
$mergedSettings = array();
/* @var $route RouterEntry */
/* @var $group RouterGroup */
for($i = 0; $i < count($routes); $i++) {
$route = $routes[$i];
@@ -148,6 +147,7 @@ class RouterBase {
if ($route->matchRoute($this->request)) {
/* @var $group RouterGroup */
$group = $route;
$mergedSettings = array_merge($settings, $group->getMergeableSettings());
@@ -214,11 +214,11 @@ class RouterBase {
$routeNotAllowed = false;
$this->request->rewrite_uri = $this->request->uri;
$this->request->rewrite_uri = $this->request->getUri();
$this->request->setUri($originalUri);
$this->request->loadedRoute = $route;
$route->loadMiddleware($this->request);
$this->request->loadedRoute->loadMiddleware($this->request);
$this->request->loadedRoute->renderRoute($this->request);