Merge pull request #8140 from annando/mail-probe

Don't update mail contacts when polling
This commit is contained in:
Hypolite Petovan 2020-01-19 15:05:00 -05:00 提交者 GitHub
當前提交 ab8997f9db
沒有發現已知的金鑰在資料庫的簽署中
GPG 金鑰 ID: 4AEE18F83AFDEB23
共有 1 個檔案被更改,包括 4 行新增1 行删除

查看文件

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