From 19de78e5110fe222dc530760f180545bf208f040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mats=20Sj=C3=B6berg?= Date: Thu, 21 Nov 2013 19:40:46 +0100 Subject: [PATCH] Fixed subscription problem with new GNU Social. --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/network.php b/include/network.php index 3bf262642..a4538e88e 100644 --- a/include/network.php +++ b/include/network.php @@ -549,7 +549,7 @@ function fetch_lrdd_template($host) { } if(count($links)) { foreach($links as $link) - if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd') + if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd' && (!$link['@attributes']['type'] || $link['@attributes']['type'] === 'application/xrd+xml')) $tpl = $link['@attributes']['template']; } if(! strpos($tpl,'{uri}')) @@ -566,7 +566,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 : 20), "application/xrd+xml"); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);