diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-01 10:34:23 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-01 10:34:23 +0200 |
| commit | 3f75dd108374d24674436c58deb9d2a795fbf604 (patch) | |
| tree | c8894111a36fcd6723d30a3ab374ddba336f71e8 | |
| parent | eb2d6fca3a583332337c709034df653a481823bf (diff) | |
| download | volse-hubzilla-3f75dd108374d24674436c58deb9d2a795fbf604.tar.gz volse-hubzilla-3f75dd108374d24674436c58deb9d2a795fbf604.tar.bz2 volse-hubzilla-3f75dd108374d24674436c58deb9d2a795fbf604.zip | |
Revert "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 b223e364c6221aa3c680505fda4acfd6a1790272.
| -rw-r--r-- | include/network.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php index 72f1dacaf..8b7490a8a 100644 --- a/include/network.php +++ b/include/network.php @@ -648,6 +648,7 @@ 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); @@ -661,6 +662,16 @@ 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. * |