friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #13124 from ne20002/develop 

fix for probe loop in case that network of contact has changed
pull/13130/head
Michael Vogel 2023-05-17 03:16:04 +02:00 committed by GitHub
parent c58dd5b471 084cd955a2
commit a52c1cde9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Contact.php
View File

@ -2682,6 +2682,8 @@ class Contact
return true; return true;
} }
$has_local_data = self::hasLocalData($id, $contact);
$uid = $contact['uid']; $uid = $contact['uid'];
unset($contact['uid']); unset($contact['uid']);
@ -2702,9 +2704,7 @@ class Contact
$updated = DateTimeFormat::utcNow(); $updated = DateTimeFormat::utcNow();
$has_local_data = self::hasLocalData($id, $contact); if (!Probe::isProbable($ret['network']) && !Probe::isProbable($contact['network'])) {
if (!Probe::isProbable($ret['network'])) {
// Periodical checks are only done on federated contacts // Periodical checks are only done on federated contacts
$failed_next_update = null; $failed_next_update = null;
$success_next_update = null; $success_next_update = null;