mirror of
https://github.com/friendica/friendica
synced 2024-11-18 10:23:41 +00:00
Fix reference to username field in Contact::updateSelfFromUserID
- Profile isn't updated with the display name in the account settings
This commit is contained in:
parent
13cb8bb395
commit
ecfbf317ae
1 changed files with 2 additions and 3 deletions
|
@ -799,7 +799,7 @@ class Contact
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$fields = ['uid', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
|
$fields = ['uid', 'username', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
|
||||||
$user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
|
$user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
|
||||||
if (!DBA::isResult($user)) {
|
if (!DBA::isResult($user)) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -818,7 +818,7 @@ class Contact
|
||||||
$url = DI::baseUrl() . '/profile/' . $user['nickname'];
|
$url = DI::baseUrl() . '/profile/' . $user['nickname'];
|
||||||
|
|
||||||
$fields = [
|
$fields = [
|
||||||
'name' => $profile['name'],
|
'name' => $user['username'],
|
||||||
'nick' => $user['nickname'],
|
'nick' => $user['nickname'],
|
||||||
'avatar-date' => $self['avatar-date'],
|
'avatar-date' => $self['avatar-date'],
|
||||||
'location' => Profile::formatLocation($profile),
|
'location' => Profile::formatLocation($profile),
|
||||||
|
@ -841,7 +841,6 @@ class Contact
|
||||||
'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
|
'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
|
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
|
||||||
if (DBA::isResult($avatar)) {
|
if (DBA::isResult($avatar)) {
|
||||||
if ($update_avatar) {
|
if ($update_avatar) {
|
||||||
|
|
Loading…
Reference in a new issue