From df2d5f04072456862382002edf7f9030c04e43fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 14:36:59 +0100
Subject: [PATCH 1/2] wrapWithCData() attribute value set

---
 utils/xmldump.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index ca9ccf812..c055764db 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -622,7 +622,7 @@ if($attrdefs) {
 		echo "\">\n";
 		echo "  <attr name=\"name\">".$attrdef->getName()."</attr>\n";
 		echo "  <attr name=\"multiple\">".$attrdef->getMultipleValues()."</attr>\n";
-		echo "  <attr name=\"valueset\">".$attrdef->getValueSet()."</attr>\n";
+		echo "  <attr name=\"valueset\">".wrapWithCData($attrdef->getValueSet())."</attr>\n";
 		echo "  <attr name=\"type\">".$attrdef->getType()."</attr>\n";
 		echo "  <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
 		echo "  <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";

From adf318abecabf21d211427f59ac4dea02bb44ff9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 14:59:13 +0100
Subject: [PATCH 2/2] wrap more fields with CData

---
 utils/xmldump.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index c055764db..353a9a376 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -276,7 +276,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 			if($attributes = $document->getAttributes()) {
 				foreach($attributes as $attribute) {
 					$attrdef = $attribute->getAttributeDefinition();
-					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 				}
 			}
 
@@ -332,7 +332,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 					if($attributes = $version->getAttributes()) {
 						foreach($attributes as $attribute) {
 							$attrdef = $attribute->getAttributeDefinition();
-							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 						}
 					}
 					if($statuslog = $version->getStatusLog()) {