From 8a1c5cf24c539dd71493267438b2b3bd555fb7c3 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 14 Oct 2015 12:26:13 +1030 Subject: [PATCH] Don't set flags relationship on non-hydrated posts --- .../flags/src/Listener/AddPostFlagsRelationship.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/flags/src/Listener/AddPostFlagsRelationship.php b/extensions/flags/src/Listener/AddPostFlagsRelationship.php index f6f4821ee..02742f5e1 100755 --- a/extensions/flags/src/Listener/AddPostFlagsRelationship.php +++ b/extensions/flags/src/Listener/AddPostFlagsRelationship.php @@ -119,10 +119,12 @@ class AddPostFlagsRelationship $postsWithPermission = []; foreach ($posts as $post) { - $post->setRelation('flags', null); + if (is_object($post)) { + $post->setRelation('flags', null); - if ($actor->can('viewFlags', $post->discussion)) { - $postsWithPermission[] = $post; + if ($actor->can('viewFlags', $post->discussion)) { + $postsWithPermission[] = $post; + } } }