diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-25 11:36:33 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-25 11:36:33 +0100 |
commit | 993fea2f05ae300fd1036d2a82ba02413f2649d4 (patch) | |
tree | 0c30b2b733d9ab0a8fe35a5117dc8866e503bfe8 /lib/private | |
parent | aeefe48cba49a869bfe93cdf10cc3da79914e080 (diff) | |
download | nextcloud-server-993fea2f05ae300fd1036d2a82ba02413f2649d4.tar.gz nextcloud-server-993fea2f05ae300fd1036d2a82ba02413f2649d4.zip |
fix appframework routing
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/appframework/app.php | 5 | ||||
-rw-r--r-- | lib/private/appframework/routing/routeactionhandler.php | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php index 6d3effbf1fa..7d32403a550 100644 --- a/lib/private/appframework/app.php +++ b/lib/private/appframework/app.php @@ -44,7 +44,10 @@ class App { * @param string $methodName the method that you want to call * @param DIContainer $container an instance of a pimple container. */ - public static function main($controllerName, $methodName, IAppContainer $container) { + public static function main($controllerName, $methodName, DIContainer $container, array $urlParams = null) { + if (!is_null($urlParams)) { + $container['urlParams'] = $urlParams; + } $controller = $container[$controllerName]; // initialize the dispatcher and run all the middleware before the controller diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/appframework/routing/routeactionhandler.php index 7fb56f14eab..2b9dc38dc43 100644 --- a/lib/private/appframework/routing/routeactionhandler.php +++ b/lib/private/appframework/routing/routeactionhandler.php @@ -37,6 +37,6 @@ class RouteActionHandler { } public function __invoke($params) { - App::main($this->controllerName, $this->actionName, $params, $this->container); + App::main($this->controllerName, $this->actionName, $this->container, $params); } } |