1
0
mirror of https://github.com/flarum/core.git synced 2025-08-07 08:56:38 +02:00

add distinct and clean up code further

This commit is contained in:
Daniël Klabbers
2022-03-23 12:04:56 +01:00
parent 907b1f10aa
commit 3343fde5f2

View File

@@ -55,9 +55,10 @@ class TagFilterGambit extends AbstractRegexGambit implements FilterInterface
{ {
$slugs = explode(',', trim($rawSlugs, '"')); $slugs = explode(',', trim($rawSlugs, '"'));
$query->leftJoin('discussion_tag', 'discussions.id', '=', 'discussion_tag.discussion_id'); $query
->distinct()
$query->where(function (Builder $query) use ($slugs, $negate) { ->leftJoin('discussion_tag', 'discussions.id', '=', 'discussion_tag.discussion_id')
->where(function (Builder $query) use ($slugs, $negate) {
foreach ($slugs as $slug) { foreach ($slugs as $slug) {
if ($slug === 'untagged' && ! $negate) { if ($slug === 'untagged' && ! $negate) {
$query->orWhereNull('discussion_tag.tag_id'); $query->orWhereNull('discussion_tag.tag_id');