Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 21:10:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore the behaviour to remove the remote contact upon termination

Browse source
This commit is contained in:
Michael 2018-09-05 05:02:06 +00:00
parent 59d06b6c78
commit 9ef1d827f3
7 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Protocol/DFRN.php
View file

@ -81,7 +81,8 @@ class DFRN
return [];
}
$user['importer_uid'] = $user['uid'];
$user['importer_uid'] = $user['uid'];
$user['uprvkey'] = $user['prvkey'];
} else {
$user = ['importer_uid' => 0, 'uprvkey' => '', 'timezone' => 'UTC',
'nickname' => '', 'sprvkey' => '', 'spubkey' => '',
@ -1168,10 +1169,12 @@ class DFRN
$a = get_app();
// At first try the Diaspora transport layer
$ret = self::transmit($owner, $contact, $atom);
if ($ret >= 200) {
logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
return $ret;
if (!$dissolve) {
$ret = self::transmit($owner, $contact, $atom);
if ($ret >= 200) {
logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
return $ret;
}
}
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);