clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into reshare-delivery

This commit is contained in:
Michael 2019-12-08 21:56:51 +00:00
parent fb64010d7a 3746dd6fa8
commit 1b0d2f2a4a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Contact.php
View File

@ -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