From eebd6dc7b5ee585fd5fffd2eb85b11a52babb9f7 Mon Sep 17 00:00:00 2001 From: diosmosis <benaka@piwik.pro> Date: Thu, 18 Sep 2014 21:16:17 -0700 Subject: [PATCH] Fix XML rendering regression. --- core/DataTable/Renderer/Xml.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index 93c800fafa..7cd10d9367 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -154,16 +154,16 @@ class Xml extends Renderer foreach ($array as $key => $value) { // based on the type of array & the key, determine how this node will look if ($isAssociativeArray) { - if (!self::isValidXmlTagName($key)) { - $prefix = "<row key=\"$key\">"; - $suffix = "</row>"; - $emptyNode = "<row key=\"$key\"/>"; - } else if (strpos($key, '=') !== false) { + if (strpos($key, '=') !== false) { list($keyAttributeName, $key) = explode('=', $key, 2); $prefix = "<row $keyAttributeName=\"$key\">"; $suffix = "</row>"; $emptyNode = "<row $keyAttributeName=\"$key\">"; + } else if (!self::isValidXmlTagName($key)) { + $prefix = "<row key=\"$key\">"; + $suffix = "</row>"; + $emptyNode = "<row key=\"$key\"/>"; } else { $prefix = "<$key>"; $suffix = "</$key>"; -- GitLab