summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/xmlreader.inc
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2016-11-08 13:50:39 -0500
committerSteve Beaver <sbeaver@netgate.com>2016-11-08 13:53:22 -0500
commitda7054b7cf77d9322307c52d8340fb30486ce25e (patch)
treeffc4aad735555127e1fc7fe4f3032c36b44962b5 /src/etc/inc/xmlreader.inc
parent92db449227aa1a49cc566b0e2cd9141ab3b1945b (diff)
downloadpfsense-da7054b7cf77d9322307c52d8340fb30486ce25e.zip
pfsense-da7054b7cf77d9322307c52d8340fb30486ce25e.tar.gz
Fixed #6893
Null configuration settings are now written as <tag></tag> instead of <tag /> for consistency
Diffstat (limited to 'src/etc/inc/xmlreader.inc')
-rw-r--r--src/etc/inc/xmlreader.inc14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc
index f904e97..ee41796 100644
--- a/src/etc/inc/xmlreader.inc
+++ b/src/etc/inc/xmlreader.inc
@@ -187,7 +187,8 @@ function dump_xml_config_sub(& $writer, $arr) {
foreach ($val as $cval) {
if (is_array($cval)) {
if (empty($cval)) {
- $writer->writeElement($ent);
+ $writer->startElement($ent);
+ $writer->endElement();
} else {
$writer->startElement($ent);
dump_xml_config_sub($writer, $cval);
@@ -198,14 +199,16 @@ function dump_xml_config_sub(& $writer, $arr) {
continue;
}
if ((is_bool($val) && ($val == true)) || ($val === "")) {
- $writer->writeElement($ent);
+ $writer->startElement($ent);
+ $writer->endElement();
} else if (!is_bool($val)) {
$writer->writeElement($ent, $cval);
}
}
}
} else if (empty($val)) {
- $writer->writeElement($ent);
+ $writer->startElement($ent);
+ $writer->endElement();
} else {
/* it's an array */
$writer->startElement($ent);
@@ -214,7 +217,8 @@ function dump_xml_config_sub(& $writer, $arr) {
}
} else {
if ((is_bool($val) && ($val == true)) || ($val === "")) {
- $writer->writeElement($ent);
+ $writer->startElement($ent);
+ $writer->endElement();
} else if (!is_bool($val)) {
$writer->writeElement($ent, $val);
}
@@ -231,6 +235,8 @@ function dump_xml_config($arr, $rootobj) {
$listtags[$tag] = $tag;
}
}
+
+
return dump_xml_config_raw($arr, $rootobj);
}
OpenPOWER on IntegriCloud