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

flarum · Apr 16, 2023 · 7a6d477 · 7a6d477
1 parent b89a01c
commit 7a6d477
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/framework/core/src/Api/Controller/ListNotificationsController.php b/framework/core/src/Api/Controller/ListNotificationsController.php
@@ -113,16 +113,16 @@ private function loadSubjectDiscussions(array $notifications)
         $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));
             }
         }
     }