diff options
| author | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
| commit | 3f414aec63257f7e9e6aa19671502794f9c1d524 (patch) | |
| tree | a4be655071e84b81b3674c3bb9acddfe5306d89a /include/network.php | |
| parent | 71afdf3d9c8cce686f0b996f4ab08e480edfc5d0 (diff) | |
| download | volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.gz volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.bz2 volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.zip | |
get rid of special "short salmon key" for statusnet
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 8 |
1 files changed, 3 insertions, 5 deletions
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(); |