#89 - Remove empty xml child nodes for empty parameters ending with a…

…n s.
jacwright · Jul 22, 2017 · 407933b · 407933b
1 parent 15689dc
commit 407933b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/source/Jacwright/RestServer/RestServer.php b/source/Jacwright/RestServer/RestServer.php
@@ -487,6 +487,8 @@ private function xml_encode($mixed, $domElement = null, $DOMDocument = null) {
 			$DOMDocument->formatOutput = true;
 			$this->xml_encode($mixed, $DOMDocument, $DOMDocument);
 			echo $DOMDocument->saveXML();
+		} else if (empty($mixed)) {
+			$domElement->appendChild($DOMDocument->createTextNode(null));
 		} else if (is_array($mixed)) {
 			foreach ($mixed as $index => $mixedElement) {
 				if (is_int($index)) {
@@ -501,7 +503,7 @@ private function xml_encode($mixed, $domElement = null, $DOMDocument = null) {
 					$domElement->appendChild($plural);
 					$node = $plural;
 
-					if (!(rtrim($index, 's') === $index)) {
+					if (!(rtrim($index, 's') === $index) && !empty($mixedElement)) {
 						$singular = $DOMDocument->createElement(rtrim($index, 's'));
 						$plural->appendChild($singular);
 						$node = $singular;