Merge pull request #542 from nextcloud/backport/541/stable20

[stable20] Correctly set the user for activity parsing when preparing a notifica…

lib/NotificationGenerator.php

@@ -78,13 +78,14 @@ private function getNotificationForEvent(IEvent $event, int $activityId): INotif
 	}
 
 	private function populateEvent(IEvent $event, string $language) {
+		$this->activityManager->setFormattingObject($event->getObjectType(), $event->getObjectId());
 		foreach ($this->activityManager->getProviders() as $provider) {
 			try {
-				$this->activityManager->setFormattingObject($event->getObjectType(), $event->getObjectId());
 				$event = $provider->parse($language, $event);
 			} catch (\InvalidArgumentException $e) {
 			}
 		}
+		$this->activityManager->setFormattingObject('', 0);
 
 		return $event;
 	}
@@ -106,7 +107,9 @@ public function prepare(INotification $notification, string $languageCode): INot
 		if (!$event || $event->getAffectedUser() !== $notification->getUser()) {
 			throw new \InvalidArgumentException();
 		}
+		$this->activityManager->setCurrentUserId($notification->getUser());
 		$event = $this->populateEvent($event, $languageCode);
+		$this->activityManager->setCurrentUserId(null);
 
 		return $this->getDisplayNotificationForEvent($event, $event->getObjectId());
 	}