allow null to be passed as 2nd arg to parse_config_xml*

in which case entire config is returned

1 files changed, 11 insertions, 7 deletions

diff --git a/etc/inc/xmlreader.inc b/etc/inc/xmlreader.inc
index 1caa6ea..96353d2 100644
--- a/etc/inc/xmlreader.inc
+++ b/etc/inc/xmlreader.inc
@@ -128,13 +128,17 @@ function parse_xml_config_raw($cffile, $rootobj, $isstring = "false") {
 	} else
 		log_error(sprintf(gettext("Error returned while trying to parse %s"), $cffile));
 
-	if (!is_array($rootobj))
-		$rootobj = array($rootobj);
-	foreach ($rootobj as $rootobj_name)
-		if ($parsedcfg[$rootobj_name])
-			break;
-
-	return $parsedcfg[$rootobj_name];
+	if ($rootobj) {
+		if (!is_array($rootobj))
+			$rootobj = array($rootobj);
+		foreach ($rootobj as $rootobj_name)
+			if ($parsedcfg[$rootobj_name])
+				break;
+		
+		return $parsedcfg[$rootobj_name];
+	} else {
+		return $parsedcfg;
+	}
 }
 
 function dump_xml_config_sub(& $writer, $arr) {