Skip to content

Commit 2ff09d9

Browse files
authored
Merge pull request #2729 from nextcloud/bugfix/2727/remove-invalid-activity-parameters
Remove invalid activity parameters
2 parents b810479 + de5fabe commit 2ff09d9

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

lib/Activity/ActivityManager.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
402402
if ($subject === self::SUBJECT_CARD_UPDATE_STACKID) {
403403
$subjectParams['stackBefore'] = $this->stackMapper->find($additionalParams['before']);
404404
$subjectParams['stack'] = $this->stackMapper->find($additionalParams['after']);
405+
unset($additionalParams['after'], $additionalParams['before']);
405406
}
406407

407408
$subjectParams['author'] = $this->userId;

lib/Activity/DeckProvider.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
143143
$params = $this->parseParamForLabel($subjectParams, $params);
144144
$params = $this->parseParamForAssignedUser($subjectParams, $params);
145145
$params = $this->parseParamForAcl($subjectParams, $params);
146-
$params = $this->parseParamForChanges($subjectParams, $params, $event);
146+
if ($subjectIdentifier !== ActivityManager::SUBJECT_CARD_UPDATE_STACKID) {
147+
$params = $this->parseParamForChanges($subjectParams, $params, $event);
148+
}
147149
$params = $this->parseParamForComment($subjectParams, $params, $event);
148150
$params = $this->parseParamForDuedate($subjectParams, $params, $event);
149151

0 commit comments

Comments
 (0)