Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-12-18 10:38:45 +0300
committerGitHub <noreply@github.com>2020-12-18 10:38:45 +0300
commit6228cbe852fba3259639f3443274a7a6f7336f92 (patch)
treebd90ada357e9561e05ceb0c5ce7b135c553b05ce
parentde7c54c6baeb9ca431516b620b25c8ca6f3b103e (diff)
parent484f52bb4dc533085ebed997f6a12341342ba7fc (diff)
Merge pull request #24737 from nextcloud/fix/23544/unset_parameter
Also unset the other possible unused paramters
-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 1c77a4eb494..71bc4a6c4f7 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -297,6 +297,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'])) {
@@ -305,6 +306,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'];