From b223e364c6221aa3c680505fda4acfd6a1790272 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 30 Apr 2018 10:28:32 +0200 Subject: Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array." This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc. --- include/network.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/network.php b/include/network.php index 8b7490a8a..72f1dacaf 100644 --- a/include/network.php +++ b/include/network.php @@ -648,7 +648,6 @@ function parse_xml_string($s, $strict = true) { libxml_use_internal_errors(true); - $x = @simplexml_load_string($s2); if($x === false) { logger('libxml: parse: error: ' . $s2, LOGGER_DATA); @@ -662,16 +661,6 @@ function parse_xml_string($s, $strict = true) { return $x; } - -function sxml2array ( $xmlObject, $out = array () ) -{ - foreach ( (array) $xmlObject as $index => $node ) - $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; - - return $out; -} - - /** * @brief Scales an external image. * -- cgit v1.2.3