diff --git a/src/Edge/Doctrine/Search/DoctrineSearcher.php b/src/Edge/Doctrine/Search/DoctrineSearcher.php index 8f2069f..bba5e7f 100644 --- a/src/Edge/Doctrine/Search/DoctrineSearcher.php +++ b/src/Edge/Doctrine/Search/DoctrineSearcher.php @@ -133,9 +133,9 @@ public function getResults($offset, $itemCountPerPage) $qb->andWhere($expressions); } + $hasFulltext = false; $keywordFields = $this->getOptions()->getKeywordFields(); - if (!empty($keywordFields) && null !== $filter->getKeywords()) { - $hasFulltext = false; + if (!empty($keywordFields) && null !== $filter->getKeywords()) { $orX = $qb->expr()->orX(); foreach ($keywordFields as $field) { @@ -159,7 +159,7 @@ public function getResults($offset, $itemCountPerPage) } } - if (null !== $filter->getSortField()) { + if (null !== $filter->getSortField() && !$hasFulltext) { $mappedSortField = $this->getMappedField($filter->getSortField()); $this->addJoin($mappedSortField['field']); $qb->orderBy($mappedSortField['field'], $filter->getSortOrder());