clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid overwriting existing contacts with bad data

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

10
src/Model/Contact.php
View File

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