diff options
author | Joas Schilling <coding@schilljs.com> | 2017-04-20 10:25:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 10:25:16 +0200 |
commit | 799b229a68d3478809c084d58b69288061139ab1 (patch) | |
tree | 54c8c71a230b537495401a814386a4c86915735c /lib | |
parent | adf316c3af6c03d2f366491a6927a724cf239425 (diff) | |
parent | 2850f09bf222e529bca3885663cdd3d002c25712 (diff) | |
download | nextcloud-server-799b229a68d3478809c084d58b69288061139ab1.tar.gz nextcloud-server-799b229a68d3478809c084d58b69288061139ab1.zip |
Merge pull request #4381 from nextcloud/2954_take_2
Fix group settings routes and fix route regression
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index e2675a3c847..70208725f46 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -231,15 +231,9 @@ class RouteConfig { $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method); - $route = $this->router->create($routeName, $url)->method($verb)->action( + $this->router->create($routeName, $url)->method($verb)->action( new RouteActionHandler($this->container, $controllerName, $actionName) ); - - if (!$collectionAction) { - $route->requirements([ - 'id' => '[^?]*' - ]); - } } } } |