From: Michael <heluecht@pirati.ca>
Date: Sat, 18 Sep 2021 20:27:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3dddea96fafbd41392efb2610440405b8f2fd07d;p=friendica.git

Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
---

3dddea96fafbd41392efb2610440405b8f2fd07d
diff --cc src/Model/Contact.php
index e7a6b529d3,54fae63b64..cd56b672c1
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@@ -791,11 -765,14 +791,14 @@@ class Contac
  			// Update the public contact as well
  			$fields['prvkey'] = null;
  			$fields['self']   = false;
 -			DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
 +			self::update($fields, ['uid' => 0, 'nurl' => $self['nurl']]);
  
  			// Update the profile
- 			$fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
- 				'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+ 			$fields = [
+ 				'photo' => User::getAvatarUrlForId($uid),
+ 				'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+ 			];
+ 
  			DBA::update('profile', $fields, ['uid' => $uid]);
  		}