friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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
parent 46216190cf c16ae0bacb
commit 64ea49788e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Protocol/Diaspora.php
View File

@ -3264,13 +3264,15 @@ class Diaspora
$logid = random_string(4);
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
// We always try to use the data from the fcontact table.
// 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']);
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
} else {
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
if (!empty($fcontact)) {
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
}
}
if (!$dest_url) {