Merge pull request #4687 from annando/fix-relay

Fix sending messages to relay servers
This commit is contained in:
Hypolite Petovan 2018-03-26 20:40:44 -04:00 committed by GitHub
commit 5a6b846445
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3222,7 +3222,7 @@ class Diaspora
// We always try to use the data from the fcontact table. // We always try to use the data from the fcontact table.
// This is important for transmitting data to Friendica servers. // This is important for transmitting data to Friendica servers.
if (!empty($contact['addr'])) { if (!empty($contact['addr']) && ($contact['network'] != NETWORK_DIASPORA)) {
$fcontact = self::personByHandle($contact['addr']); $fcontact = self::personByHandle($contact['addr']);
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]); $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
} else { } else {