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

Merge remote-tracking branch 'upstream/develop' into item-enhanced

This commit is contained in:
Michael 2018-02-22 10:04:57 +00:00
parent 24a20fc294 8a3927e12c
commit d7442559e0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Protocol/Diaspora.php
View File

@ -826,9 +826,14 @@ class Diaspora
// if Diaspora connectivity is enabled on their server // if Diaspora connectivity is enabled on their server
if ($r && ($r["network"] === NETWORK_DIASPORA)) { if ($r && ($r["network"] === NETWORK_DIASPORA)) {
self::addFContact($r, $update); self::addFContact($r, $update);
// Fetch the updated or added contact
$person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
if (!DBM::is_result($person)) {
$person = $r; $person = $r;
} }
} }
}
return $person; return $person;
} }