From d2fe8718deb55f1e54a50ea0b8f1140c5aed14dd Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 13 Mar 2015 18:15:41 +0000
Subject: [PATCH] sync master

---
 .../mvc/app/library/OPNsense/Core/Config.php      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
index ce967ba8a..23d728e35 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
@@ -253,12 +253,21 @@ class Config extends Singleton
     public function __toString()
     {
         // reformat XML (pretty print)
-        $configxml = dom_import_simplexml($this->simplexml);
         $dom = new \DOMDocument('1.0');
-        $dom_sxe = $dom->importNode($configxml, true);
-        $dom->appendChild($dom_sxe);
+
+        // make sure our root element is always called "opnsense"
+        $root = $dom->createElement('opnsense');
+        $dom->appendChild($root);
+
+        foreach ($this->simplexml as $node) {
+            $domNode = dom_import_simplexml($node);
+            $domNode = $root->ownerDocument->importNode($domNode, true);
+            $root->appendChild($domNode);
+        }
+
         $dom->formatOutput = true;
         $dom->preserveWhiteSpace = false;
+
         $dom->loadXML($dom->saveXML());
 
         return $dom->saveXML();