Skip to content

Commit f047d7d

Browse files
authored
Merge pull request #90 from magento-engcom/MAGETWO-64971-PR-7339
MAGETWO-64971: [GitHub][PR] Fix/xml parser issue #7339
2 parents 8b16cd5 + 738fa97 commit f047d7d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/internal/Magento/Framework/Xml/Parser.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ protected function _xmlToArray($currentNode = false)
111111
$value = ['_value' => $value, '_attribute' => $attributes];
112112
}
113113
if (isset($content[$node->nodeName])) {
114-
if (!isset($content[$node->nodeName][0]) || !is_array($content[$node->nodeName][0])) {
114+
if (
115+
(is_string($content[$node->nodeName]) || !isset($content[$node->nodeName][0]))
116+
|| (is_array($value) && !is_array($content[$node->nodeName][0]))
117+
) {
115118
$oldValue = $content[$node->nodeName];
116119
$content[$node->nodeName] = [];
117120
$content[$node->nodeName][] = $oldValue;

0 commit comments

Comments
 (0)