forked from GNUsocial/gnu-social
Use Profile->getBestName() in PersonalGroupNav instead of manually picking nickname vs fullname. Logic should still work the same when no nickname is provided, but it doesn't make any sense -- probably needs cleanup. :)
This commit is contained in:
parent
6e03456753
commit
8e04e88800
@ -87,8 +87,11 @@ class PersonalGroupNav extends Widget
|
|||||||
if ($nickname) {
|
if ($nickname) {
|
||||||
$user = User::staticGet('nickname', $nickname);
|
$user = User::staticGet('nickname', $nickname);
|
||||||
$user_profile = $user->getProfile();
|
$user_profile = $user->getProfile();
|
||||||
|
$name = $user_profile->getBestName();
|
||||||
} else {
|
} else {
|
||||||
|
// @fixme can this happen? is this valid?
|
||||||
$user_profile = false;
|
$user_profile = false;
|
||||||
|
$name = $nickname;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->out->elementStart('ul', array('class' => 'nav'));
|
$this->out->elementStart('ul', array('class' => 'nav'));
|
||||||
@ -97,22 +100,22 @@ class PersonalGroupNav extends Widget
|
|||||||
$this->out->menuItem(common_local_url('all', array('nickname' =>
|
$this->out->menuItem(common_local_url('all', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_('Personal'),
|
_('Personal'),
|
||||||
sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
|
sprintf(_('%s and friends'), $name),
|
||||||
$action == 'all', 'nav_timeline_personal');
|
$action == 'all', 'nav_timeline_personal');
|
||||||
$this->out->menuItem(common_local_url('replies', array('nickname' =>
|
$this->out->menuItem(common_local_url('replies', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_('Replies'),
|
_('Replies'),
|
||||||
sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
|
sprintf(_('Replies to %s'), $name),
|
||||||
$action == 'replies', 'nav_timeline_replies');
|
$action == 'replies', 'nav_timeline_replies');
|
||||||
$this->out->menuItem(common_local_url('showstream', array('nickname' =>
|
$this->out->menuItem(common_local_url('showstream', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_('Profile'),
|
_('Profile'),
|
||||||
($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
|
$name,
|
||||||
$action == 'showstream', 'nav_profile');
|
$action == 'showstream', 'nav_profile');
|
||||||
$this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
|
$this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_('Favorites'),
|
_('Favorites'),
|
||||||
sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
|
sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
|
||||||
$action == 'showfavorites', 'nav_timeline_favorites');
|
$action == 'showfavorites', 'nav_timeline_favorites');
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
Loading…
Reference in New Issue
Block a user