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

[BUGFIX] Optimised getRoute for custom urls.

Browse Source
This commit is contained in:
Simon Sessingø
2015-11-01 07:36:13 +01:00
parent 649ed28a91
commit 846c9e6584
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+9 -3
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 && $this->loadedRoute !== null) { if($controller === null && $parameters === 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 && $route !== null) { if($controller === $c) {
return $this->processUrl($route, $method, $parameters, $getParams); return $this->processUrl($route, $method, $parameters, $getParams);
} }
} }
@@ -307,7 +307,13 @@ class RouterBase {
ArrayUtil::append($url, $parameters); ArrayUtil::append($url, $parameters);
} }
return '/' . join('/', $url); $url = '/' . trim(join('/', $url), '/') . '/';
if(is_array($getParams)) {
$url .= '?' . Url::arrayToParams($getParams);
}
return $url;
} }
public static function getInstance() { public static function getInstance() {