friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #12512 from annando/available 

A server is only reachable when the network can be detected
pull/12516/head
Philipp 2022-12-23 08:28:34 +01:00 committed by GitHub
parent b898dd1c00 998b05095b
commit e5e4d142ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/GServer.php
View File

@ -191,11 +191,11 @@ class GServer
$condition = ['nurl' => Strings::normaliseLink($server)]; $condition = ['nurl' => Strings::normaliseLink($server)];
} }
$gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed'], $condition); $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], $condition);
if (empty($gserver)) { if (empty($gserver)) {
$reachable = true; $reachable = true;
} else { } else {
$reachable = !$gserver['failed']; $reachable = !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
$server = $gserver['url']; $server = $gserver['url'];
} }