Merge branch '2.1.x' into 2.2.x

Smile-SA · Nov 30, 2016 · 0fe19de · 0fe19de
2 parents e9e669a + 9d1cb1b
commit 0fe19de
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/module-elasticsuite-tracker/view/frontend/templates/variables/page.phtml b/src/module-elasticsuite-tracker/view/frontend/templates/variables/page.phtml
@@ -21,7 +21,7 @@
     <script type="text/javascript">
     <!--
     <?php foreach ($variables as $varName => $value) : ?>
-        smileTracker.addPageVar('<?php /* @noEscape */ echo $this->escapeJsQuote($varName)?>', '<?php /* @noEscape */ echo $this->escapeJsQuote($value)?>')
+        smileTracker.addPageVar('<?php /* @noEscape */ echo $this->escapeJsQuote($varName)?>', '<?php /* @noEscape */ echo $block->stripTags($this->escapeJsQuote($value), null, true) ?>')
     <?php endforeach; ?>
     //-->
     </script>

diff --git a/src/module-elasticsuite-virtual-category/Model/Category/Attribute/Backend/VirtualRule.php b/src/module-elasticsuite-virtual-category/Model/Category/Attribute/Backend/VirtualRule.php
@@ -47,15 +47,20 @@ public function beforeSave($object)
         $attributeCode = $this->getAttributeCode();
         $attributeData = $object->getData($attributeCode);
 
-        $rule = $this->ruleFactory->create();
+        if ($attributeData !== null) {
+            $rule = $this->ruleFactory->create();
 
-        if ($attributeData !== null && is_object($attributeData)) {
-            $rule = $attributeData;
-        } elseif ($attributeData !== null && is_array($attributeData)) {
-            $rule->loadPost($attributeData);
-        }
+            if (is_object($attributeData)) {
+                $rule = $attributeData;
+            } elseif (is_array($attributeData)) {
+                $rule->loadPost($attributeData);
+            } elseif (is_string($attributeData)) {
+                $attributeData = unserialize($attributeData);
+                $rule->getConditions()->loadArray($attributeData);
+            }
 
-        $object->setData($attributeCode, serialize($rule->getConditions()->asArray()));
+            $object->setData($attributeCode, serialize($rule->getConditions()->asArray()));
+        }
 
         return $this;
     }