Merge pull request #4489 from annando/missing-fid

When refreshing the fcontact, the returned array was incomplete
This commit is contained in:
Hypolite Petovan 2018-02-22 05:03:30 -05:00 committed by GitHub
commit 8a3927e12c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -826,7 +826,12 @@ 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);
$person = $r;
// Fetch the updated or added contact
$person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
if (!DBM::is_result($person)) {
$person = $r;
}
} }
} }