MAGETWO-64971: [GitHub][PR] Fix/xml parser issue #7339

- Merge Pull Request #7339 from dvynograd/magento2:fix/xml-parser-issue
magento · Feb 22, 2017 · 738fa97 · 738fa97
2 parents 8b16cd5 + 5bb5dd9
commit 738fa97
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;