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

Merge pull request #170 from skipperbent/v2

Browse Source 
V2
This commit is contained in:
Simon Sessingø
2016-11-21 05:28:00 +02:00
committed by GitHub
parent 9d275d6d3b 7e7319de06
commit c522801c28
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/Router.php
+2 -3
View File
@@ -396,7 +396,7 @@ class Router
/* Return current route if no options has been specified */ /* Return current route if no options has been specified */
if ($name === null && $parameters === null) { if ($name === null && $parameters === null) {
return '/' . trim(parse_url($this->request->getUri(), PHP_URL_PATH), '/') . '/' . $this->arrayToParams($getParams); return '/' . trim(parse_url($this->request->getUri(), PHP_URL_PATH), '/') . $this->arrayToParams($getParams);
} }
/* If nothing is defined and a route is loaded we use that */ /* If nothing is defined and a route is loaded we use that */
@@ -434,8 +434,7 @@ class Router
} }
/* No result so we assume that someone is using a hardcoded url and join everything together. */ /* No result so we assume that someone is using a hardcoded url and join everything together. */
return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . $this->arrayToParams($getParams);
return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . '/' . $this->arrayToParams($getParams);
} }
/** /**