From: Michael <heluecht@pirati.ca>
Date: Wed, 19 Aug 2020 04:11:20 +0000 (+0000)
Subject: Avoid local network requests
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=29494ea721b9ea2b2feee0f2950ecf7c1b8e4a69;p=friendica.git

Avoid local network requests
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 4f7cd2598b..7772bad878 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1576,24 +1576,27 @@ class Contact
 			return;
 		}
 
-		$data = [
-			$contact['photo'] ?? '',
-			$contact['thumb'] ?? '',
-			$contact['micro'] ?? '',
-		];
-
-		$update = ($contact['avatar'] != $avatar) || $force;
-
+		// Replace cached avatar pictures from the default avatar with the default avatars in different sizes
 		if (strpos($avatar, self::DEFAULT_AVATAR_PHOTO)) {
 			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
 				'photo' => DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO,
 				'thumb' => DI::baseUrl() . self::DEFAULT_AVATAR_THUMB,
 				'micro' => DI::baseUrl() . self::DEFAULT_AVATAR_MICRO];
-			DBA::update('contact', $fields, ['id' => $cid]);
-			Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'album' => Photo::CONTACT_PHOTOS]);
+			if ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) {
+				DBA::update('contact', $fields, ['id' => $cid]);
+				Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'album' => Photo::CONTACT_PHOTOS]);
+			}
 			return;
 		}
 
+		$data = [
+			$contact['photo'] ?? '',
+			$contact['thumb'] ?? '',
+			$contact['micro'] ?? '',
+		];
+
+		$update = ($contact['avatar'] != $avatar) || $force;
+
 		if (!$update) {
 			foreach ($data as $image_uri) {
 				$image_rid = Photo::ridFromURI($image_uri);