github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 09:11:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix query errors

Browse Source
This commit is contained in:
Toby Zerner 2018-01-21 08:33:45 +10:30
parent c0dd66bef5
commit e8103ad0b3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/approval/src/Access/DiscussionPolicy.php
View File

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

5
extensions/approval/src/Access/PostPolicy.php
View File

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