Merge pull request #10896 from annando/relationship
Don't degrade an existing relationship when following again
This commit is contained in:
commit
42be3c1224
|
@ -2462,7 +2462,7 @@ class Contact
|
||||||
|
|
||||||
if (DBA::isResult($contact)) {
|
if (DBA::isResult($contact)) {
|
||||||
// update contact
|
// update contact
|
||||||
$new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
|
$new_relation = (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND]) ? self::FRIEND : self::SHARING);
|
||||||
|
|
||||||
$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
|
$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
|
||||||
self::update($fields, ['id' => $contact['id']]);
|
self::update($fields, ['id' => $contact['id']]);
|
||||||
|
|
Loading…
Reference in a new issue