Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #836 from msjoberg/master

Browse source 
Fixed subscription problem with new GNU Social.
This commit is contained in:
Tobias Diekershoff 2013-11-21 11:03:47 -08:00
commit f19615c21c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/network.php
View file

@ -549,7 +549,7 @@ function fetch_lrdd_template($host) {
} }
if(count($links)) { if(count($links)) {
foreach($links as $link) 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']; $tpl = $link['@attributes']['template'];
} }
if(! strpos($tpl,'{uri}')) if(! strpos($tpl,'{uri}'))
@ -566,7 +566,7 @@ function fetch_xrd_links($url) {
$xrd_timeout = intval(get_config('system','xrd_timeout')); $xrd_timeout = intval(get_config('system','xrd_timeout'));
$redirects = 0; $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); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);