From d2a00225c7b4cce7c187fed6a3ef371dd1e4888a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 23 Oct 2018 07:23:41 +1030 Subject: [PATCH] Clarify ambiguous use of `user_id` column which was crashing search queries --- extensions/approval/src/Access/DiscussionPolicy.php | 2 +- extensions/approval/src/Access/PostPolicy.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/approval/src/Access/DiscussionPolicy.php b/extensions/approval/src/Access/DiscussionPolicy.php index 2f760fdf4..74f1055ab 100644 --- a/extensions/approval/src/Access/DiscussionPolicy.php +++ b/extensions/approval/src/Access/DiscussionPolicy.php @@ -51,7 +51,7 @@ class DiscussionPolicy extends AbstractPolicy if (! $actor->hasPermission('discussion.approvePosts')) { $query->where(function (Builder $query) use ($actor) { - $query->where('user_id', $actor->id) + $query->where('discussion.user_id', $actor->id) ->orWhere($this->canApprovePosts($actor)); }); } diff --git a/extensions/approval/src/Access/PostPolicy.php b/extensions/approval/src/Access/PostPolicy.php index 21e86218b..c754cdf29 100644 --- a/extensions/approval/src/Access/PostPolicy.php +++ b/extensions/approval/src/Access/PostPolicy.php @@ -52,7 +52,7 @@ class PostPolicy extends AbstractPolicy if (! $actor->hasPermission('discussion.approvePosts')) { $query->where(function (Builder $query) use ($actor) { - $query->where('user_id', $actor->id) + $query->where('posts.user_id', $actor->id) ->orWhereExists($this->discussionWhereCanApprovePosts($actor)); }); }