From 484f52bb4dc533085ebed997f6a12341342ba7fc Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 16 Dec 2020 20:31:30 +0100
Subject: [PATCH] Also unset the other possible unused paramters

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/Route/Router.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 1c77a4eb494ce..71bc4a6c4f7d8 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -297,6 +297,7 @@ public function match($url) {
 		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 @@ public function match($url) {
 				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'];