From d12ec7cff148c7406fb56af3d753fbf2b7a5e28c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 18 Apr 2017 21:50:25 +0200 Subject: [PATCH] Revert "Match slashes in ../{id} resource routes" This reverts commit 31f9be7a75712e9f8b7831ed29397527f9fa8baf. Signed-off-by: Roeland Jago Douma --- lib/private/AppFramework/Routing/RouteConfig.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index e2675a3c84..70208725f4 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' => '[^?]*' - ]); - } } } }