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

Merge pull request #51 from skipperbent/development

Browse Source 
Latest development
This commit is contained in:
Simon Sessingø
2015-12-13 03:07:20 +01:00
parent 5a19d6339c 4f07f38cf5
commit 669bfa0a86
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+11 -1
View File
@@ -280,8 +280,18 @@ 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');
} }
// Return current route if no options has been specified
if($controller === null && $parameters === null && $this->loadedRoute !== null) { if($controller === null && $parameters === null && $this->loadedRoute !== null) {
return $this->processUrl($this->loadedRoute, null, $getParams); $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
$url = parse_url(Request::getInstance()->getUri());
$url = $url['path'];
if(count($getParams)) {
$url .= '?' . $this->arrayToParams($getParams);
}
return $url;
} }
$c = ''; $c = '';