ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2755 from nextcloud/backport/2751/stable1.2

Browse Source 
[stable1.2] Properly set author for activity events that are triggered by cron
This commit is contained in:
Julius Härtl
2021-01-27 16:34:42 +01:00
committed by GitHub
parent 950e50120f 8574c71aaf
commit 2115669ab5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Activity/ActivityManager.php
View File

@@ -405,13 +405,12 @@ class ActivityManager {
unset($additionalParams['after'], $additionalParams['before']); unset($additionalParams['after'], $additionalParams['before']);
} }
$subjectParams['author'] = $this->userId; $subjectParams['author'] = $author === null ? $this->userId : $author;
$event = $this->manager->generateEvent(); $event = $this->manager->generateEvent();
$event->setApp('deck') $event->setApp('deck')
->setType($eventType) ->setType($eventType)
->setAuthor($author === null ? $this->userId : $author) ->setAuthor($subjectParams['author'])
->setObject($objectType, (int)$object->getId(), $object->getTitle()) ->setObject($objectType, (int)$object->getId(), $object->getTitle())
->setSubject($subject, array_merge($subjectParams, $additionalParams)) ->setSubject($subject, array_merge($subjectParams, $additionalParams))
->setTimestamp(time()); ->setTimestamp(time());