clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't assume AP with Wordpress

This commit is contained in:
Michael 2022-02-06 09:21:14 +00:00
parent 85f029a724
commit b3da88ceaa
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Model/GServer.php
View File

@ -496,7 +496,7 @@ class GServer
$serverdata['url'] = $url; $serverdata['url'] = $url;
$serverdata['nurl'] = Strings::normaliseLink($url); $serverdata['nurl'] = Strings::normaliseLink($url);
if ($serverdata['network'] == Protocol::PHANTOM) { if (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
$serverdata = self::detectNetworkViaContacts($url, $serverdata); $serverdata = self::detectNetworkViaContacts($url, $serverdata);
} }
@ -1617,11 +1617,8 @@ class GServer
$serverdata['version'] = $version_part[1]; $serverdata['version'] = $version_part[1];
// We still do need a reliable test if some AP plugin is activated // We still do need a reliable test if some AP plugin is activated
if (DBA::exists('apcontact', ['baseurl' => $url])) { // By now we just check in a later process for some known contacts
$serverdata['network'] = Protocol::ACTIVITYPUB;
} else {
$serverdata['network'] = Protocol::FEED; $serverdata['network'] = Protocol::FEED;
}
if ($serverdata['detection-method'] == self::DETECT_MANUAL) { if ($serverdata['detection-method'] == self::DETECT_MANUAL) {
$serverdata['detection-method'] = self::DETECT_BODY; $serverdata['detection-method'] = self::DETECT_BODY;