From 3f414aec63257f7e9e6aa19671502794f9c1d524 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Jul 2012 16:54:18 -0700 Subject: get rid of special "short salmon key" for statusnet --- include/network.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include/network.php') diff --git a/include/network.php b/include/network.php index 9e6f8355b..221906296 100644 --- a/include/network.php +++ b/include/network.php @@ -537,7 +537,7 @@ function fetch_xrd_links($url) { $xrd_timeout = intval(get_config('system','xrd_timeout')); $redirects = 0; - $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 20)); + $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30)); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); @@ -547,11 +547,9 @@ function fetch_xrd_links($url) { // fix diaspora's bad xml $xml = str_replace(array('href="','"/>'),array('href="','"/>'),$xml); - $h = parse_xml_string($xml); - if(! $h) - return array(); + $arr = xml2array($xml); - $arr = convert_xml_element_to_array($h); + logger('fetch_xrd_links: ' . print_r($arr,true), LOGGER_DATA); $links = array(); -- cgit v1.2.3