mirror of
https://github.com/friendica/friendica
synced 2024-12-23 03:20:15 +00:00
Merge pull request #8140 from annando/mail-probe
Don't update mail contacts when polling
This commit is contained in:
commit
ab8997f9db
1 changed files with 4 additions and 1 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue