Also unset the other possible unused paramters
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
5ea6481355
commit
5de0c3c5f7
|
@ -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'];
|
||||||
|
|
Loading…
Reference in New Issue