MC-17947: Search by email is working incorrect in Sales > Orders grid

nikita-shcherbatykh · nikita-shcherbatykh · commit b55f47417407 · 2019-07-11T10:29:18.000+03:00
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -16,9 +16,9 @@
 class FulltextFilter implements FilterApplierInterface
 {
     /**
-     * Patterns using in preg_replace
+     * Patterns using for escaping special characters in escapeAgainstValue method
      */
-    private $patterns = [
+    private $escapePatterns = [
         '/[@\.]/' => '\_',
         '/([+\-><\(\)~*]+)/' => ' ',
     ];
@@ -78,7 +78,7 @@ function ($column) use ($alias) {
      */
     private function escapeAgainstValue(string $value): string
     {
-        return preg_replace(array_keys($this->patterns), array_values($this->patterns), $value);
+        return preg_replace(array_keys($this->escapePatterns), array_values($this->escapePatterns), $value);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@`
`16`	`16`	`class FulltextFilter implements FilterApplierInterface`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`		`- * Patterns using in preg_replace`
	`19`	`+ * Patterns using for escaping special characters in escapeAgainstValue method`
`20`	`20`	`*/`
`21`		`- private $patterns = [`
	`21`	`+ private $escapePatterns = [`
`22`	`22`	`'/[@\.]/' => '\_',`
`23`	`23`	`'/([+\-><\(\)~*]+)/' => ' ',`
`24`	`24`	`];`
`@@ -78,7 +78,7 @@ function ($column) use ($alias) {`
`78`	`78`	`*/`
`79`	`79`	`private function escapeAgainstValue(string $value): string`
`80`	`80`	`{`
`81`		`- return preg_replace(array_keys($this->patterns), array_values($this->patterns), $value);`
	`81`	`+ return preg_replace(array_keys($this->escapePatterns), array_values($this->escapePatterns), $value);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`