From de5fabe66936a3b80a23f2f615424eb215c60cbe Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 15 Jan 2021 15:33:11 +0100
Subject: [PATCH] Remove invalid activity parameters

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/ActivityManager.php | 1 +
 lib/Activity/DeckProvider.php    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
index 11d03c318..243fe1a7d 100644
--- a/lib/Activity/ActivityManager.php
+++ b/lib/Activity/ActivityManager.php
@@ -402,6 +402,7 @@ class ActivityManager {
 		if ($subject === self::SUBJECT_CARD_UPDATE_STACKID) {
 			$subjectParams['stackBefore'] = $this->stackMapper->find($additionalParams['before']);
 			$subjectParams['stack'] = $this->stackMapper->find($additionalParams['after']);
+			unset($additionalParams['after'], $additionalParams['before']);
 		}
 
 		$subjectParams['author'] = $this->userId;
diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index 372ee16b3..98ffb3590 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -143,7 +143,9 @@ class DeckProvider implements IProvider {
 		$params = $this->parseParamForLabel($subjectParams, $params);
 		$params = $this->parseParamForAssignedUser($subjectParams, $params);
 		$params = $this->parseParamForAcl($subjectParams, $params);
-		$params = $this->parseParamForChanges($subjectParams, $params, $event);
+		if ($subjectIdentifier !== ActivityManager::SUBJECT_CARD_UPDATE_STACKID) {
+			$params = $this->parseParamForChanges($subjectParams, $params, $event);
+		}
 		$params = $this->parseParamForComment($subjectParams, $params, $event);
 		$params = $this->parseParamForDuedate($subjectParams, $params, $event);