Merge pull request #4737 from annando/fix-public-comment

Commenting on public posts from Friendica users is now possible again
This commit is contained in:
Tobias Diekershoff 2018-04-04 09:29:06 +02:00 committed by GitHub
commit 64ea49788e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3264,13 +3264,15 @@ class Diaspora
$logid = random_string(4); $logid = random_string(4);
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
// 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']) && ($contact['network'] != NETWORK_DIASPORA)) { if (!empty($contact['addr'])) {
$fcontact = self::personByHandle($contact['addr']); $fcontact = self::personByHandle($contact['addr']);
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]); if (!empty($fcontact)) {
} else { $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]); }
} }
if (!$dest_url) { if (!$dest_url) {