mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11210 from owncloud/issue/11209 

Also match routes without trailing slash for files app
This commit is contained in:
Morris Jobke 2014-09-22 14:04:20 +02:00
parent b0e0d0d2d2 71bec60b92
commit 831d34f084
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/route/router.php
View File

@ -13,6 +13,7 @@ use Symfony\Component\Routing\Matcher\UrlMatcher;
use Symfony\Component\Routing\Generator\UrlGenerator; use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RequestContext;
use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
class Router implements IRouter { class Router implements IRouter {
/** /**
@ -215,8 +216,26 @@ class Router implements IRouter {
} else { } else {
$this->loadRoutes(); $this->loadRoutes();
} }
$matcher = new UrlMatcher($this->root, $this->context); $matcher = new UrlMatcher($this->root, $this->context);
$parameters = $matcher->match($url); try {
$parameters = $matcher->match($url);
} catch (ResourceNotFoundException $e) {
if (substr($url, -1) !== '/') {
// We allow links to apps/files? for backwards compatibility reasons
// However, since Symfony does not allow empty route names, the route
// we need to match is '/', so we need to append the '/' here.
try {
$parameters = $matcher->match($url . '/');
} catch (ResourceNotFoundException $newException) {
// If we still didn't match a route, we throw the original exception
throw $e;
}
} else {
throw $e;
}
}
if (isset($parameters['action'])) { if (isset($parameters['action'])) {
$action = $parameters['action']; $action = $parameters['action'];
if (!is_callable($action)) { if (!is_callable($action)) {