diff --git a/framework/core/src/Api/Controller/ListNotificationsController.php b/framework/core/src/Api/Controller/ListNotificationsController.php index c7921f708..517dd854a 100644 --- a/framework/core/src/Api/Controller/ListNotificationsController.php +++ b/framework/core/src/Api/Controller/ListNotificationsController.php @@ -113,16 +113,16 @@ class ListNotificationsController extends AbstractListController $ids = []; foreach ($notifications as $notification) { - if ($notification->subject && property_exists($notification->subject, 'discussion_id')) { - $ids[] = $notification->subject->discussion_id; + if ($notification->subject && ($discussionId = $notification->subject->getAttribute('discussion_id'))) { + $ids[] = $discussionId; } } $discussions = Discussion::query()->find(array_unique($ids)); foreach ($notifications as $notification) { - if ($notification->subject && property_exists($notification->subject, 'discussion_id')) { - $notification->subject->setRelation('discussion', $discussions->find($notification->subject->discussion_id)); + if ($notification->subject && ($discussionId = $notification->subject->getAttribute('discussion_id'))) { + $notification->subject->setRelation('discussion', $discussions->find($discussionId)); } } }