Merge pull request #2752 from nextcloud/backport/2729/stable1.2

[stable1.2] Remove invalid activity parameters
nextcloud · Jan 27, 2021 · 950e501 · 950e501
2 parents 191b22f + 1ec75e6
commit 950e501
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -402,6 +402,7 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
 		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
@@ -143,7 +143,9 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
 		$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);