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

Bugfix: fixed using empty value in url still parsing current

Browse Source 
parameters.
This commit is contained in:
Simon Sessingø
2017-08-13 18:01:48 +01:00
parent 796d01bc25
commit 5086347802
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/Route/LoadableRoute.php
+6 -4
View File
@@ -124,15 +124,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
for ($i = $max; $i >= 0; $i--) { for ($i = $max; $i >= 0; $i--) {
$param = $keys[$i]; $param = $keys[$i];
if($parameters !== null) { if ($parameters === '' || (is_array($parameters) && count($parameters) === 0)) {
$parameters = (array)$parameters; $value = '';
$value = array_key_exists($param, $parameters) ? $parameters[$param] : $params[$param]; } else {
} $p = (array)$parameters;
$value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
/* If parameter is specifically set to null - use the original-defined value */ /* If parameter is specifically set to null - use the original-defined value */
if ($value === null && isset($this->originalParameters[$param])) { if ($value === null && isset($this->originalParameters[$param])) {
$value = $this->originalParameters[$param]; $value = $this->originalParameters[$param];
} }
}
if (stripos($url, $param1) !== false || stripos($url, $param) !== false) { if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
/* Add parameter to the correct position */ /* Add parameter to the correct position */