Merge remote-tracking branch 'mike/master' into dev

2018-05-05 07:22:31 +02:00
parent f995ef0124 6e91d85bcb
commit b0ca73c1ba
2 changed files with 2 additions and 2 deletions
--- a/include/network.php
+++ b/include/network.php
@@ -797,7 +797,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
 	if($namespaces)
 		$parser = @xml_parser_create_ns("UTF-8",':');
 	else
-		$parser = @xml_parser_create('UTF-8');
+		$parser = @xml_parser_create();

 	if(! $parser) {
 		logger('xml2array: xml_parser_create: no resource');