Merge remote-tracking branch 'upstream/develop' into item-enhanced
This commit is contained in:
commit
d7442559e0
1 changed files with 6 additions and 1 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue