bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8140 from annando/mail-probe

Browse source 
Don't update mail contacts when polling
This commit is contained in:
Hypolite Petovan 2020-01-19 15:05:00 -05:00 committed by GitHub
commit ab8997f9db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/Worker/OnePoll.php
View file

@ -38,7 +38,6 @@ class OnePoll
return; return;
} }
Contact::updateFromProbe($contact_id, '', $force);
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
@ -46,6 +45,10 @@ class OnePoll
return; return;
} }
if (($contact['network'] != Protocol::MAIL) || $force) {
Contact::updateFromProbe($contact_id, '', $force);
}
// Special treatment for wrongly detected local contacts // Special treatment for wrongly detected local contacts
if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) { if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) {
Contact::updateFromProbe($contact_id, Protocol::DFRN, true); Contact::updateFromProbe($contact_id, Protocol::DFRN, true);