Skip to content

Commit c936761

Browse files
committed
TASK: Merge branch '6.0' int master
# Conflicts: # .travis.yml
2 parents 1b19696 + 7910fd4 commit c936761

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ before_install:
2424
- composer require --no-update --no-interaction neos/content-repository-search:dev-master
2525
- composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:dev-master
2626
- composer require --no-update --no-interaction neos/nodetypes
27+
- composer remove --no-update --no-interaction neos/site-kickstarter
2728
install:
2829
- composer install --no-interaction
2930
- cd ..

Classes/Eel/ElasticSearchQueryBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public function count()
675675
public function fulltext(string $searchWord, array $options = []): QueryBuilderInterface
676676
{
677677
// We automatically enable result highlighting when doing fulltext searches. It is up to the user to use this information or not use it.
678-
$this->request->fulltext(trim(json_encode($searchWord), '"'), $options);
678+
$this->request->fulltext(trim(json_encode($searchWord, JSON_UNESCAPED_UNICODE), '"'), $options);
679679
$this->request->highlight(150, 2);
680680

681681
return $this;

0 commit comments

Comments
 (0)