aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-12-21 11:43:49 +0100
committerGitHub <noreply@github.com>2020-12-21 11:43:49 +0100
commit98c235a4360a18fe1808f0d65d04707203c6be2d (patch)
treeb8fa4fb542ecc0898cc6a7796bd2665e09c6983d /lib/private
parent2a91d7837ba855479c33654c3ac51ec1904cce5f (diff)
parent5de0c3c5f7fd15f2a1eab099c7e74e3ae34f0eea (diff)
downloadnextcloud-server-98c235a4360a18fe1808f0d65d04707203c6be2d.tar.gz
nextcloud-server-98c235a4360a18fe1808f0d65d04707203c6be2d.zip
Merge pull request #24751 from nextcloud/backport/24737/stable20
[stable20] Also unset the other possible unused paramters
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Route/Router.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 94c637e5e0d..413b42d95c9 100644
--- 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'];