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

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 f620274c6a.
This commit is contained in:
Mario Vavti 2018-04-30 10:28:32 +02:00
parent 0c27fdd944
commit b223e364c6
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/network.php
View File

@ -648,7 +648,6 @@ function parse_xml_string($s, $strict = true) {
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
$x = @simplexml_load_string($s2); $x = @simplexml_load_string($s2);
if($x === false) { if($x === false) {
logger('libxml: parse: error: ' . $s2, LOGGER_DATA); logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
@ -662,16 +661,6 @@ function parse_xml_string($s, $strict = true) {
return $x; 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. * @brief Scales an external image.
* *