MERGE: Merge branch '3.0' into master

kdambekalns · kdambekalns · commit 1444bb49836d · 2017-03-17T17:21:01.000+01:00
diff --git a/Classes/Eel/ElasticSearchQueryBuilder.php b/Classes/Eel/ElasticSearchQueryBuilder.php
@@ -616,7 +616,7 @@ public function count()
     public function fulltext($searchWord)
     {
         // We automatically enable result highlighting when doing fulltext searches. It is up to the user to use this information or not use it.
-        $this->request->fulltext($searchWord);
+        $this->request->fulltext(json_encode($searchWord));
         $this->request->highlight(150, 2);
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ public function count()`
`616`	`616`	`public function fulltext($searchWord)`
`617`	`617`	`{`
`618`	`618`	`// We automatically enable result highlighting when doing fulltext searches. It is up to the user to use this information or not use it.`
`619`		`- $this->request->fulltext($searchWord);`
	`619`	`+ $this->request->fulltext(json_encode($searchWord));`
`620`	`620`	`$this->request->highlight(150, 2);`
`621`	`621`
`622`	`622`	`return $this;`