diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-30 10:27:11 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-30 10:27:11 +0200 |
| commit | e1738e8021dd482421e0d7aaae91bc4600550e34 (patch) | |
| tree | 4bd946b01495bdbd0ab860ca883e3975bef2e0f1 | |
| parent | a33dfff188b572b4f2331d239f28151439d006fe (diff) | |
| download | volse-hubzilla-e1738e8021dd482421e0d7aaae91bc4600550e34.tar.gz volse-hubzilla-e1738e8021dd482421e0d7aaae91bc4600550e34.tar.bz2 volse-hubzilla-e1738e8021dd482421e0d7aaae91bc4600550e34.zip | |
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.
| -rw-r--r-- | include/network.php | 11 |
1 files changed, 0 insertions, 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. * |