Merge pull request #1999 from rbayet/fix_1978_filter_special_characte…

…rs_prevent_removal_2_8_x Fixes #1978 Do not rely on escaped value to compare
Smile-SA · Nov 18, 2020 · fdf48c5 · fdf48c5
2 parents d398e7f + f260af9
commit fdf48c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/module-elasticsuite-catalog/Model/Layer/Filter/Attribute.php b/src/module-elasticsuite-catalog/Model/Layer/Filter/Attribute.php
@@ -108,6 +108,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
 
             foreach ($this->currentFilterValue as $currentFilter) {
                 $filter = $this->_createItem($this->escaper->escapeHtml($currentFilter), $this->currentFilterValue);
+                $filter->setRawValue($currentFilter);
                 $layerState->addFilter($filter);
             }
         }

diff --git a/src/module-elasticsuite-catalog/Model/Layer/Filter/Item/Attribute.php b/src/module-elasticsuite-catalog/Model/Layer/Filter/Item/Attribute.php
@@ -47,7 +47,7 @@ public function getRemoveUrl()
         $query = [$this->getFilter()->getRequestVar() => $this->getFilter()->getResetValue()];
 
         if (is_array($this->getApplyValue())) {
-            $resetValue = array_diff($this->getApplyValue(), [$this->getLabel()]);
+            $resetValue = array_diff($this->getApplyValue(), [$this->getRawValue() ?? $this->getLabel()]);
             if (count($resetValue) < 2) {
                 $resetValue = current($resetValue);
             }