geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 22:12:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from skipperbent/development

Browse Source 
[BUGFIX] Fixed Exceptions due to route null value.
This commit is contained in:
Simon Sessingø
2015-10-30 02:28:40 +01:00
parent 5cb7086e96 649ed28a91
commit 0df469184c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+2 -2
View File
@@ -253,7 +253,7 @@ class RouterBase {
throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null'); throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
} }
if($controller === null && $parameters === null) { if($controller === null && $parameters === null && $this->loadedRoute !== null) {
return $this->processUrl($this->loadedRoute, null, $getParams); return $this->processUrl($this->loadedRoute, null, $getParams);
} }
@@ -295,7 +295,7 @@ class RouterBase {
$method = $tmp[1]; $method = $tmp[1];
} }
if($controller === $c) { if($controller === $c && $route !== null) {
return $this->processUrl($route, $method, $parameters, $getParams); return $this->processUrl($route, $method, $parameters, $getParams);
} }
} }