From e8103ad0b3a6ec115f9a795ded1fa0af027b025e Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 21 Jan 2018 08:33:45 +1030 Subject: [PATCH] Fix query errors --- extensions/approval/src/Access/DiscussionPolicy.php | 2 +- extensions/approval/src/Access/PostPolicy.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/approval/src/Access/DiscussionPolicy.php b/extensions/approval/src/Access/DiscussionPolicy.php index 45928e205..44d879cdd 100644 --- a/extensions/approval/src/Access/DiscussionPolicy.php +++ b/extensions/approval/src/Access/DiscussionPolicy.php @@ -76,7 +76,7 @@ class DiscussionPolicy extends AbstractPolicy { return function ($query) use ($actor) { $this->events->dispatch( - new ScopeModelVisibility($query, $actor, 'approvePosts') + new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'approvePosts') ); }; } diff --git a/extensions/approval/src/Access/PostPolicy.php b/extensions/approval/src/Access/PostPolicy.php index 4f869f54e..ce936b057 100644 --- a/extensions/approval/src/Access/PostPolicy.php +++ b/extensions/approval/src/Access/PostPolicy.php @@ -10,6 +10,7 @@ namespace Flarum\Approval\Access; +use Flarum\Discussion\Discussion; use Flarum\Event\ScopeModelVisibility; use Flarum\Post\Post; use Flarum\User\AbstractPolicy; @@ -50,7 +51,7 @@ class PostPolicy extends AbstractPolicy if (! $actor->hasPermission('discussion.approvePosts')) { $query->where(function (Builder $query) use ($actor) { - $query->where('start_user_id', $actor->id) + $query->where('user_id', $actor->id) ->orWhereExists($this->discussionWhereCanApprovePosts($actor)); }); } @@ -70,7 +71,7 @@ class PostPolicy extends AbstractPolicy { return function ($query) use ($actor) { $this->events->dispatch( - new ScopeModelVisibility($query, $actor, 'approvePosts') + new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'approvePosts') ); }; }