mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 06:57:54 +02:00
Code Issues Releases Wiki Activity

Clarify ambiguous use of user_id column which was crashing search queries

Browse Source
This commit is contained in:
Toby Zerner
2018-10-23 07:23:41 +10:30
parent 90d4294456
commit d2a00225c7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ class DiscussionPolicy extends AbstractPolicy
if (! $actor->hasPermission('discussion.approvePosts')) { if (! $actor->hasPermission('discussion.approvePosts')) {
$query->where(function (Builder $query) use ($actor) { $query->where(function (Builder $query) use ($actor) {
$query->where('user_id', $actor->id) $query->where('discussion.user_id', $actor->id)
->orWhere($this->canApprovePosts($actor)); ->orWhere($this->canApprovePosts($actor));
}); });
} }

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

@@ -52,7 +52,7 @@ class PostPolicy extends AbstractPolicy
if (! $actor->hasPermission('discussion.approvePosts')) { if (! $actor->hasPermission('discussion.approvePosts')) {
$query->where(function (Builder $query) use ($actor) { $query->where(function (Builder $query) use ($actor) {
$query->where('user_id', $actor->id) $query->where('posts.user_id', $actor->id)
->orWhereExists($this->discussionWhereCanApprovePosts($actor)); ->orWhereExists($this->discussionWhereCanApprovePosts($actor));
}); });
} }