mirror of
https://github.com/flarum/core.git
synced 2025-08-04 15:37:51 +02:00
fix: notification subject discussion eager loading fails (#3788)
This commit is contained in:
@@ -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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user