friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2474 from annando/1604-hubzilla-quickfix 

Quickfix for Hubzilla systems with enabled OStatus addon
This commit is contained in:
Tobias Diekershoff 2016-04-23 06:49:29 +02:00
parent aac046c91b e76475d81f
commit 76c04e6782
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Scrape.php
View File

@ -846,6 +846,18 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
if (($result2['network'] != "") AND ($result2['network'] != NETWORK_FEED)) if (($result2['network'] != "") AND ($result2['network'] != NETWORK_FEED))
$result = $result2; $result = $result2;
} }
// Quickfix for Hubzilla systems with enabled OStatus plugin
if (($result['network'] == NETWORK_DIASPORA) AND ($result["batch"] == "")) {
$result2 = probe_url($url, PROBE_DIASPORA, ++$level);
if ($result2['network'] == NETWORK_DIASPORA) {
$addr = $result["addr"];
$result = $result2;
if (($result["addr"] == "") AND ($addr != ""))
$result["addr"] = $addr;
}
}
} }
// Only store into the cache if the value seems to be valid // Only store into the cache if the value seems to be valid