Merge branch 'ACP2E-1444' of https://github.com/magento-l3/magento2ce into PR-L3-2023-01-31

Author: aplapana

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -1484,5 +1484,8 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
-
-</entities>
+    <entity name="ProductWithSpecialCharsInSKU" extends="SimpleProduct" type="product">
+        <data key="name">Simple Product with special characters in SKU</data>
+        <data key="sku">s000&amp;01</data>
+    </entity>
+</entities>

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -395,8 +395,8 @@ protected function getConditions()
             ? $this->getData('conditions_encoded')
             : $this->getData('conditions');
 
-        if ($conditions) {
-            $conditions = $this->conditionsHelper->decode($conditions);
+        if (is_string($conditions)) {
+            $conditions = $this->decodeConditions($conditions);
         }
 
         foreach ($conditions as $key => $condition) {
@@ -577,4 +577,16 @@ private function getWidgetPagerBlockName()
 
         return $pagerBlockName . '.' . $pageName;
     }
+
+    /**
+     * Decode encoded special characters and unserialize conditions into array
+     *
+     * @param string $encodedConditions
+     * @return array
+     * @see \Magento\Widget\Model\Widget::getDirectiveParam
+     */
+    private function decodeConditions(string $encodedConditions): array
+    {
+        return $this->conditionsHelper->decode(htmlspecialchars_decode($encodedConditions));
+    }
 }