[BUGFIX] Fixed minor errors with optional parameter when using getRoute().

This commit is contained in:
Simon Sessingø
2016-01-17 04:56:29 +01:00
parent 27d24758b1
commit 4dd0739df9
2 changed files with 14 additions and 2 deletions
+9 -1
View File
@@ -40,10 +40,18 @@ class RouterRoute extends RouterEntry {
$parameters = $this->parseParameters($route, $url);
if($parameters !== null) {
$this->parameters = $parameters;
if(is_array($this->parameters)) {
$this->parameters = array_merge($this->parameters, $parameters);
} else {
$this->parameters = $parameters;
}
return true;
}
return null;
}