Also unset the other possible unused paramters

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 94c637e5e0d001de2c963140f9e896b3f042bf84..413b42d95c99b9ad8711cdc639b542cda2e22815 100644 (file)
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -304,6 +304,7 @@ class Router implements IRouter {
                if (isset($parameters['caller'])) {
                        $caller = $parameters['caller'];
                        unset($parameters['caller']);
+                       unset($parameters['action']);
                        $application = $this->getApplicationClass($caller[0]);
                        \OC\AppFramework\App::main($caller[1], $caller[2], $application->getContainer(), $parameters);
                } elseif (isset($parameters['action'])) {
@@ -312,6 +313,7 @@ class Router implements IRouter {
                                throw new \Exception('not a callable action');
                        }
                        unset($parameters['action']);
+                       unset($parameters['caller']);
                        call_user_func($action, $parameters);
                } elseif (isset($parameters['file'])) {
                        include $parameters['file'];