github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-12 06:03:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Specify ambiguous column names

Browse Source
This commit is contained in:
Toby Zerner 2018-07-21 17:21:37 +09:30
parent 9ca95afafe
commit 97a94a8c60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Discussion/DiscussionPolicy.php
View File

@ -92,7 +92,7 @@ class DiscussionPolicy extends AbstractPolicy
if (! $actor->hasPermission('discussion.hide')) { if (! $actor->hasPermission('discussion.hide')) {
$query->where(function ($query) use ($actor) { $query->where(function ($query) use ($actor) {
$query->whereNull('discussions.hidden_at') $query->whereNull('discussions.hidden_at')
->orWhere('user_id', $actor->id) ->orWhere('discussions.user_id', $actor->id)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$this->events->fire( $this->events->fire(
new ScopeModelVisibility($query, $actor, 'hide') new ScopeModelVisibility($query, $actor, 'hide')
@ -105,8 +105,8 @@ class DiscussionPolicy extends AbstractPolicy
// current user, or the user is allowed to edit the discussion's posts. // current user, or the user is allowed to edit the discussion's posts.
if (! $actor->hasPermission('discussion.editPosts')) { if (! $actor->hasPermission('discussion.editPosts')) {
$query->where(function ($query) use ($actor) { $query->where(function ($query) use ($actor) {
$query->where('comment_count', '>', 0) $query->where('discussions.comment_count', '>', 0)
->orWhere('user_id', $actor->id) ->orWhere('discussions.user_id', $actor->id)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$this->events->dispatch( $this->events->dispatch(
new ScopeModelVisibility($query, $actor, 'editPosts') new ScopeModelVisibility($query, $actor, 'editPosts')

2
framework/core/src/Post/PostPolicy.php
View File

@ -82,7 +82,7 @@ class PostPolicy extends AbstractPolicy
if (! $actor->hasPermission('discussion.editPosts')) { if (! $actor->hasPermission('discussion.editPosts')) {
$query->where(function ($query) use ($actor) { $query->where(function ($query) use ($actor) {
$query->whereNull('posts.hidden_at') $query->whereNull('posts.hidden_at')
->orWhere('user_id', $actor->id) ->orWhere('posts.user_id', $actor->id)
->orWhereExists(function ($query) use ($actor) { ->orWhereExists(function ($query) use ($actor) {
$query->selectRaw('1') $query->selectRaw('1')
->from('discussions') ->from('discussions')