aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-05 07:22:31 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-05 07:22:31 +0200
commitb0ca73c1ba351b5516c467acdf5dc212c5a2a7c1 (patch)
tree7a87cf3eb149e3953becf042d9327892481ecd23 /include
parentf995ef012444617ead1760d16f712ca0051dc68b (diff)
parent6e91d85bcb3e98874f4c5d06ccaf1bca26577872 (diff)
downloadvolse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.tar.gz
volse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.tar.bz2
volse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/network.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php
index c55660da8..26ed24de2 100644
--- 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');