Merge remote-tracking branch 'upstream/develop' into reshare-delivery
This commit is contained in:
commit
1b0d2f2a4a
|
@ -1457,6 +1457,7 @@ class Contact extends BaseObject
|
||||||
|
|
||||||
if (DBA::isResult($contact)) {
|
if (DBA::isResult($contact)) {
|
||||||
$contact_id = $contact["id"];
|
$contact_id = $contact["id"];
|
||||||
|
$update_contact = false;
|
||||||
|
|
||||||
// Update the contact every 7 days (Don't update mail or feed contacts)
|
// Update the contact every 7 days (Don't update mail or feed contacts)
|
||||||
if (in_array($contact['network'], Protocol::FEDERATED)) {
|
if (in_array($contact['network'], Protocol::FEDERATED)) {
|
||||||
|
@ -1477,8 +1478,6 @@ class Contact extends BaseObject
|
||||||
if (DBA::isResult($mailcontact)) {
|
if (DBA::isResult($mailcontact)) {
|
||||||
DBA::update('contact', $mailcontact, ['id' => $contact_id]);
|
DBA::update('contact', $mailcontact, ['id' => $contact_id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$update_contact = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the contact in the background if needed but it is called by the frontend
|
// Update the contact in the background if needed but it is called by the frontend
|
||||||
|
|
Loading…
Reference in a new issue