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 f620274c6a.
			
			
This commit is contained in:
		| @@ -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. | ||||
|  * | ||||
|   | ||||
		Reference in New Issue
	
	Block a user