mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24751 from nextcloud/backport/24737/stable20 

[stable20] Also unset the other possible unused paramters
This commit is contained in:
Roeland Jago Douma 2020-12-21 11:43:49 +01:00 committed by GitHub
parent 2a91d7837b 5de0c3c5f7
commit 98c235a436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Route/Router.php
View File

@ -304,6 +304,7 @@ class Router implements IRouter {
if (isset($parameters['caller'])) { if (isset($parameters['caller'])) {
$caller = $parameters['caller']; $caller = $parameters['caller'];
unset($parameters['caller']); unset($parameters['caller']);
unset($parameters['action']);
$application = $this->getApplicationClass($caller[0]); $application = $this->getApplicationClass($caller[0]);
\OC\AppFramework\App::main($caller[1], $caller[2], $application->getContainer(), $parameters); \OC\AppFramework\App::main($caller[1], $caller[2], $application->getContainer(), $parameters);
} elseif (isset($parameters['action'])) { } elseif (isset($parameters['action'])) {
@ -312,6 +313,7 @@ class Router implements IRouter {
throw new \Exception('not a callable action'); throw new \Exception('not a callable action');
} }
unset($parameters['action']); unset($parameters['action']);
unset($parameters['caller']);
call_user_func($action, $parameters); call_user_func($action, $parameters);
} elseif (isset($parameters['file'])) { } elseif (isset($parameters['file'])) {
include $parameters['file']; include $parameters['file'];