Merge pull request #90 from magento-engcom/MAGETWO-64971-PR-7339

MAGETWO-64971: [GitHub][PR] Fix/xml parser issue #7339
magento · Feb 22, 2017 · f047d7d · f047d7d
2 parents 8b16cd5 + 738fa97
commit f047d7d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/internal/Magento/Framework/Xml/Parser.php b/lib/internal/Magento/Framework/Xml/Parser.php
@@ -111,7 +111,10 @@ protected function _xmlToArray($currentNode = false)
  $value = ['_value' => $value, '_attribute' => $attributes];
  }
  if (isset($content[$node->nodeName])) {
- if (!isset($content[$node->nodeName][0]) || !is_array($content[$node->nodeName][0])) {
+ if (
+ (is_string($content[$node->nodeName]) || !isset($content[$node->nodeName][0]))
+ || (is_array($value) && !is_array($content[$node->nodeName][0]))
+ ) {
  $oldValue = $content[$node->nodeName];
  $content[$node->nodeName] = [];
  $content[$node->nodeName][] = $oldValue;