keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure that an existing contact isn't archived or pending

Browse source
This commit is contained in:
Michael 2019-05-03 05:54:40 +00:00
parent 6c34196264
commit b1222e174e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Model/Contact.php
View file

@ -2105,11 +2105,14 @@ class Contact extends BaseObject
$network = $pub_contact['network']; $network = $pub_contact['network'];
if (is_array($contact)) { if (is_array($contact)) {
// Make sure that the existing contact isn't archived
self::unmarkForArchival($contact);
$protocol = self::getProtocol($url, $contact['network']); $protocol = self::getProtocol($url, $contact['network']);
if (($contact['rel'] == self::SHARING) if (($contact['rel'] == self::SHARING)
|| ($sharing && $contact['rel'] == self::FOLLOWER)) { || ($sharing && $contact['rel'] == self::FOLLOWER)) {
DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true], DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
['id' => $contact['id'], 'uid' => $importer['uid']]); ['id' => $contact['id'], 'uid' => $importer['uid']]);
} }