friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 01:54:58 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid overwriting existing contacts with bad data

Browse source
This commit is contained in:
Michael 2019-04-09 08:35:29 +00:00
parent e268b50890
commit bca7419987
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Contact.php
View file

@ -1295,14 +1295,10 @@ class Contact extends BaseObject
return 0; return 0;
} }
if (!empty($default)) { $contact = array_merge(self::getProbeDataFromDatabase($url), $default);
$contact = $default;
} else {
$contact = self::getProbeDataFromDatabase($url);
if (empty($contact)) { if (empty($contact)) {
return 0; return 0;
} }
}
$data = array_merge($data, $contact); $data = array_merge($data, $contact);
} }