Merge pull request #4138 from nextcloud/resources_match_fullid

Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00 · 2017-04-04 15:52:53 -05:00 · fa4107893d
parent b78876236d 31f9be7a75
commit fa4107893d
1 changed files with 7 additions and 1 deletions
--- a/lib/private/AppFramework/Routing/RouteConfig.php
+++ b/lib/private/AppFramework/Routing/RouteConfig.php
@ -231,9 +231,15 @@ class RouteConfig {

 				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);

-				$this->router->create($routeName, $url)->method($verb)->action(
+				$route = $this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
 				);
+
+				if (!$collectionAction) {
+					$route->requirements([
+						'id' => '[^?]*'
+					]);
+				}
 			}
 		}
 	}