Merge remote-tracking branch 'upstream/develop' into conversation-moved
This commit is contained in:
commit
96055cafff
6 changed files with 59 additions and 32 deletions
|
@ -144,7 +144,7 @@ function unfollow_process(string $url)
|
|||
Contact::terminateFriendship($owner, $contact, $dissolve);
|
||||
}
|
||||
|
||||
// Sharing-only contacts get deleted as there no relationship any more
|
||||
// Sharing-only contacts get deleted as there no relationship anymore
|
||||
if ($dissolve) {
|
||||
Contact::remove($contact['id']);
|
||||
$return_path = $base_return_path;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue