Skip to content

Commit 62332f1

Browse files
ENGCOM-1011: Backport of PR-8772 for Magento 2.1: #3882 #14219
- Merge Pull Request #14219 from hostep/magento2:backport-pr-8772 - Merged commits: 1. 80f1e92
2 parents ca240ab + 80f1e92 commit 62332f1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/code/Magento/Widget/Model/Config/Converter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function convert($source)
4444
case 'parameters':
4545
/** @var $parameter \DOMNode */
4646
foreach ($widgetSubNode->childNodes as $parameter) {
47-
if ($parameter->nodeName === '#text') {
47+
if ($parameter->nodeName === '#text' || $parameter->nodeName === '#comment') {
4848
continue;
4949
}
5050
$subNodeAttributes = $parameter->attributes;
@@ -57,7 +57,7 @@ public function convert($source)
5757
$widgetArray['supported_containers'] = [];
5858
}
5959
foreach ($widgetSubNode->childNodes as $container) {
60-
if ($container->nodeName === '#text') {
60+
if ($container->nodeName === '#text' || $container->nodeName === '#comment') {
6161
continue;
6262
}
6363
$widgetArray['supported_containers'] = array_merge(

app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<label translate="true">Orders and Returns</label>
1212
<description translate="true">Orders and Returns Search Form</description>
1313
<parameters>
14+
<!-- Comment added to check fix to https://github.com/magento/magento2/issues/3882 -->
1415
<parameter name="title" xsi:type="text" visible="false">
1516
<label translate="true">Anchor Custom Title</label>
1617
</parameter>
@@ -54,6 +55,7 @@
5455
</parameter>
5556
</parameters>
5657
<containers>
58+
<!-- Comment added to check fix to https://github.com/magento/magento2/issues/3882 -->
5759
<container name="left">
5860
<template name="default" value="default_template" />
5961
</container>

0 commit comments

Comments
 (0)