mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Quickfix for Hubzilla systems with enabled OStatus addon

Browse source
This commit is contained in:
Michael Vogel 2016-04-22 23:58:06 +02:00
parent 19a24d6ada
commit e76475d81f
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/Scrape.php
View file

@ -596,7 +596,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
if($diaspora && $diaspora_base && $diaspora_guid) { if($diaspora && $diaspora_base && $diaspora_guid) {
$diaspora_notify = $diaspora_base.'receive/users/'.$diaspora_guid; $diaspora_notify = $diaspora_base.'receive/users/'.$diaspora_guid;
if($mode == PROBE_DIASPORA || ! $notify || ($notify == $diaspora_notify)) { if($mode == PROBE_DIASPORA || !$notify || ($notify == $diaspora_notify)) {
$notify = $diaspora_notify; $notify = $diaspora_notify;
$batch = $diaspora_base . 'receive/public' ; $batch = $diaspora_base . 'receive/public' ;
} }
@ -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