mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-12 03:12:13 +00:00
Fixed: return / if all parameters are empty in $router->getUrl method.
This commit is contained in:
@@ -248,6 +248,7 @@ class Router
|
|||||||
|
|
||||||
if ($rewriteRoute !== null) {
|
if ($rewriteRoute !== null) {
|
||||||
$rewriteRoute->loadMiddleware($this->request);
|
$rewriteRoute->loadMiddleware($this->request);
|
||||||
|
|
||||||
return $rewriteRoute->renderRoute($this->request);
|
return $rewriteRoute->renderRoute($this->request);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,6 +266,7 @@ class Router
|
|||||||
/* Render route */
|
/* Render route */
|
||||||
$routeNotAllowed = false;
|
$routeNotAllowed = false;
|
||||||
$this->request->setLoadedRoute($route);
|
$this->request->setLoadedRoute($route);
|
||||||
|
|
||||||
return $route->renderRoute($this->request);
|
return $route->renderRoute($this->request);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -323,6 +325,7 @@ class Router
|
|||||||
|
|
||||||
if ($rewriteRoute !== null) {
|
if ($rewriteRoute !== null) {
|
||||||
$rewriteRoute->loadMiddleware($this->request);
|
$rewriteRoute->loadMiddleware($this->request);
|
||||||
|
|
||||||
return $rewriteRoute->renderRoute($this->request);
|
return $rewriteRoute->renderRoute($this->request);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,6 +437,10 @@ class Router
|
|||||||
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 ($name === '' && $parameters === '') {
|
||||||
|
return '/';
|
||||||
|
}
|
||||||
|
|
||||||
/* Only merge $_GET when all parameters are null */
|
/* Only merge $_GET when all parameters are null */
|
||||||
if ($name === null && $parameters === null && $getParams === null) {
|
if ($name === null && $parameters === null && $getParams === null) {
|
||||||
$getParams = $_GET;
|
$getParams = $_GET;
|
||||||
|
|||||||
Reference in New Issue
Block a user