bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8974 from annando/issue-8967

Browse source 
Issue 8967: Fix avatar in top bar
This commit is contained in:
Hypolite Petovan 2020-08-05 10:30:20 -04:00 committed by GitHub
parent f81164de7a 0224bc8367
commit 8042119447
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
view/theme/frio/theme.php
View file

@ -195,8 +195,7 @@ function frio_remote_nav($a, &$nav)
// this isn't optimal because the contact query will be done now twice // this isn't optimal because the contact query will be done now twice
$fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl']; $fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl'];
if (local_user() && !empty($a->user['uid'])) { if (local_user() && !empty($a->user['uid'])) {
$remoteUser = Contact::getById($a->user['uid'], $fields); $remoteUser = Contact::selectFirst($fields, ['uid' => $a->user['uid'], 'self' => true]);
$remoteUser['name'] = $a->user['username'];
} elseif (!local_user() && remote_user()) { } elseif (!local_user() && remote_user()) {
$remoteUser = Contact::getById(remote_user(), $fields); $remoteUser = Contact::getById(remote_user(), $fields);
$nav['remote'] = DI::l10n()->t('Guest'); $nav['remote'] = DI::l10n()->t('Guest');