Merge pull request #2755 from nextcloud/backport/2751/stable1.2
[stable1.2] Properly set author for activity events that are triggered by cron
This commit is contained in:
@@ -405,13 +405,12 @@ class ActivityManager {
|
||||
unset($additionalParams['after'], $additionalParams['before']);
|
||||
}
|
||||
|
||||
$subjectParams['author'] = $this->userId;
|
||||
|
||||
$subjectParams['author'] = $author === null ? $this->userId : $author;
|
||||
|
||||
$event = $this->manager->generateEvent();
|
||||
$event->setApp('deck')
|
||||
->setType($eventType)
|
||||
->setAuthor($author === null ? $this->userId : $author)
|
||||
->setAuthor($subjectParams['author'])
|
||||
->setObject($objectType, (int)$object->getId(), $object->getTitle())
|
||||
->setSubject($subject, array_merge($subjectParams, $additionalParams))
|
||||
->setTimestamp(time());
|
||||
|
||||
Reference in New Issue
Block a user