Merge pull request #2751 from nextcloud/bugfix/noid/cron-activity-author

Properly set author for activity events that are triggered by cron
nextcloud · Jan 27, 2021 · 2f1dfad · 2f1dfad
2 parents c32357f + 147a402
commit 2f1dfad
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -405,13 +405,12 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
 			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());