mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 07:27:39 +02:00
Code Issues Releases Wiki Activity

fix: notification subject discussion eager loading fails (#3788)

Browse Source
This commit is contained in:
Sami Mazouz
2023-04-16 21:12:01 +01:00
committed by GitHub
parent b89a01c010
commit 7a6d477550
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/src/Api/Controller/ListNotificationsController.php
View File

@@ -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));
}
}
}