Merge pull request #2374 from nextcloud/fix/activity

fix small issues in relation to activities

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index 55530292..bf6875c4 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -86,7 +86,11 @@ class ActivityService {
 
 	public function getActivityMessage(ActivityEvent $event, string $language, bool $filtered = false) : string {
 		$this->l10n = $this->transFactory->get($event->getApp(), $language);
-		$this->userIsActor = $event->getAuthor() === $this->userSession->getUser()->getUID();
+		try {
+			$this->userIsActor = $event->getAuthor() === $this->userSession->getUser()->getUID();
+		} catch (\Exception $e) {
+			$this->userIsActor = false;
+		}
 		$this->eventType = $event->getType();
 		$parameters = $event->getSubjectParameters();
 		$this->shareType = $parameters['shareType']['name'] ?? '';