MAGETWO-44555: Exception in Advanced Search if used special symbols

aohorodnyk · aohorodnyk · commit 3d95c895d3bf · 2015-10-27T10:57:05.000+02:00
- Moved fix to another class
diff --git a/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php b/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
@@ -68,8 +68,6 @@ public function getMatchQuery($columns, $expression, $mode = self::FULLTEXT_MODE
 
         $expression = $this->connection->quote($expression);
 
-        $expression = str_replace('%', '\\%', $expression);
-
         $condition = self::MATCH . " ({$columns}) " . self::AGAINST . " ({$expression} {$mode})";
         return $condition;
     }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -15,7 +15,7 @@
 
 class Match implements QueryInterface
 {
-    const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=';
+    const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%';
 
     const MINIMAL_CHARACTER_LENGTH = 3;
 

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ public function getMatchQuery($columns, $expression, $mode = self::FULLTEXT_MODE`
`68`	`68`
`69`	`69`	`$expression = $this->connection->quote($expression);`
`70`	`70`
`71`		`- $expression = str_replace('%', '\\%', $expression);`
`72`		`-`
`73`	`71`	`$condition = self::MATCH . " ({$columns}) " . self::AGAINST . " ({$expression} {$mode})";`
`74`	`72`	`return $condition;`
`75`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class Match implements QueryInterface`
`17`	`17`	`{`
`18`		- const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=';
	`18`	+ const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%';
`19`	`19`
`20`	`20`	`const MINIMAL_CHARACTER_LENGTH = 3;`
`21`	`21`