From 9516c7578b526f455bf26959f24fd9250763e1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 17 Apr 2019 14:35:03 +0200 Subject: [PATCH] Properly check for available data (fixes #921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Activity/ActivityManager.php | 2 ++ lib/Activity/DeckProvider.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index f5a9e937a..efd2ea48e 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -302,6 +302,8 @@ class ActivityManager { try { $object = $this->findObjectForEntity($objectType, $entity); } catch (DoesNotExistException $e) { + \OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', $entity); + return null; } catch (MultipleObjectsReturnedException $e) { \OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', $entity); return null; diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php index d6f2fc4d9..1a95f6940 100644 --- a/lib/Activity/DeckProvider.php +++ b/lib/Activity/DeckProvider.php @@ -104,7 +104,7 @@ class DeckProvider implements IProvider { ]; $event->setAuthor($author); if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) { - if ($event->getObjectName() === '') { + if (isset($subjectParams['board']) && $event->getObjectName() === '') { $event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['board']['title']); } $board = [ @@ -116,7 +116,7 @@ class DeckProvider implements IProvider { $params['board'] = $board; } - if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) { + if (isset($subjectParams['card']) && $event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) { if ($event->getObjectName() === '') { $event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['card']['title']); }