From: Michael <heluecht@pirati.ca>
Date: Tue, 9 Apr 2019 08:35:29 +0000 (+0000)
Subject: Avoid overwriting existing contacts with bad data
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bca7419987bb3f3c5782b9f8f80d5fa3b614c963;p=friendica.git

Avoid overwriting existing contacts with bad data
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1b38fde2ed..51264d4697 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -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);