fix ambiguous
This commit is contained in:
parent
cb3d4f5225
commit
e26d90d7b6
|
|
@ -132,7 +132,7 @@ class SearchController extends ListDiscussionsController
|
||||||
->select('discussions.*')
|
->select('discussions.*')
|
||||||
->join('posts', 'posts.discussion_id', 'discussions.id')
|
->join('posts', 'posts.discussion_id', 'discussions.id')
|
||||||
// Extra safety to prevent leaking hidden discussion (titles) towards search results.
|
// Extra safety to prevent leaking hidden discussion (titles) towards search results.
|
||||||
->when(! $actor->hasPermission('discussion.hide'), fn($query) => $query->whereNull('hidden_at'))
|
->when($actor->isGuest() || ! $actor->hasPermission('discussion.hide'), fn($query) => $query->whereNull('discussions.hidden_at'))
|
||||||
->where(function ($query) use ($results) {
|
->where(function ($query) use ($results) {
|
||||||
$query
|
$query
|
||||||
->whereIn('discussions.id', $results->pluck('discussion_id')->filter())
|
->whereIn('discussions.id', $results->pluck('discussion_id')->filter())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue