Commit 337b1b08 by Qiang Xue

Fixes #1298: supporting route with trailing slash.

parent 210cbda7
...@@ -586,7 +586,8 @@ abstract class Module extends Component ...@@ -586,7 +586,8 @@ abstract class Module extends Component
Yii::$app->controller = $oldController; Yii::$app->controller = $oldController;
return $result; return $result;
} else { } else {
throw new InvalidRouteException('Unable to resolve the request "' . trim($this->getUniqueId() . '/' . $route, '/') . '".'); $id = $this->getUniqueId();
throw new InvalidRouteException('Unable to resolve the request "' . ($id === '' ? $route : $id . '/' . $route) . '".');
} }
} }
...@@ -608,9 +609,8 @@ abstract class Module extends Component ...@@ -608,9 +609,8 @@ abstract class Module extends Component
if ($route === '') { if ($route === '') {
$route = $this->defaultRoute; $route = $this->defaultRoute;
} }
if (($pos = strpos($route, '/')) !== false) { if (strpos($route, '/') !== false) {
$id = substr($route, 0, $pos); list ($id, $route) = explode('/', $route, 2);
$route = substr($route, $pos + 1);
} else { } else {
$id = $route; $id = $route;
$route = ''; $route = '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment