harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.""

Browse Source 
This reverts commit b223e364c6.
This commit is contained in:
Mario Vavti 2018-05-01 10:34:23 +02:00
parent eb2d6fca3a
commit 3f75dd1083
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/network.php
View File

@ -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.
*