Merge remote-tracking branch 'origin/MAGETWO-43292' into SEGFAULT_BANNERS_PR

Yaroslav Onischenko · Yaroslav Onischenko · commit 0c82102bbc4d · 2017-05-25T12:37:54.000+03:00
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -162,7 +162,9 @@ protected function _addField($parameter)
             }
         }
 
-        $data['value'] = html_entity_decode($data['value']);
+        if (is_scalar($data['value'])) {
+            $data['value'] = html_entity_decode($data['value']);
+        }
 
         // prepare element dropdown values
         if ($values = $parameter->getValues()) {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,9 @@ protected function _addField($parameter)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`- $data['value'] = html_entity_decode($data['value']);`
	`165`	`+ if (is_scalar($data['value'])) {`
	`166`	`+ $data['value'] = html_entity_decode($data['value']);`
	`167`	`+ }`
`166`	`168`
`167`	`169`	`// prepare element dropdown values`
`168`	`170`	`if ($values = $parameter->getValues()) {`