ENGCOM-1486: [Forwardport] FIX for issue#14855 - Adding an * to do a customer search #15077

magento-engcom-team · magento-engcom-team · commit c9a74f9363b8 · 2018-05-08T13:15:14.000-05:00
- Merge Pull Request #15077 from adrian-martinez-interactiv4/magento2:2.3-develop-PR-port-14905 - Merged commits: 1. 01b546f
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -62,6 +62,16 @@ function ($column) use ($alias) {
         return $columns;
     }
 
+    /**
+     * Escape against value
+     * @param string $value
+     * @return string
+     */
+    private function escapeAgainstValue(string $value): string
+    {
+        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
+    }
+
     /**
      * Apply fulltext filters
      *
@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)
         $collection->getSelect()
             ->where(
                 'MATCH(' . implode(',', $columns) . ') AGAINST(?)',
-                $filter->getValue()
+                $this->escapeAgainstValue($filter->getValue())
             );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,16 @@ function ($column) use ($alias) {`
`62`	`62`	`return $columns;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ /**`
	`66`	`+ * Escape against value`
	`67`	`+ * @param string $value`
	`68`	`+ * @return string`
	`69`	`+ */`
	`70`	`+ private function escapeAgainstValue(string $value): string`
	`71`	`+ {`
	`72`	`+ return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);`
	`73`	`+ }`
	`74`	`+`
`65`	`75`	`/**`
`66`	`76`	`* Apply fulltext filters`
`67`	`77`	`*`
`@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)`
`86`	`96`	`$collection->getSelect()`
`87`	`97`	`->where(`
`88`	`98`	`'MATCH(' . implode(',', $columns) . ') AGAINST(?)',`
`89`		`- $filter->getValue()`
	`99`	`+ $this->escapeAgainstValue($filter->getValue())`
`90`	`100`	`);`
`91`	`101`	`}`
`92`	`102`	`}`