diff options
| author | Brion Vibber <brion@pobox.com> | 2010-11-03 13:11:34 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-11-03 13:11:34 -0700 |
| commit | 8e04e88800047b13fc4dbe316f37249cc2988cd2 (patch) | |
| tree | 149b90c517ec35268ea21939436ad772a4da4aa9 /lib/personalgroupnav.php | |
| parent | 6e034567539d12c17759577f5392e86c3aca2fa6 (diff) | |
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. :)
Diffstat (limited to 'lib/personalgroupnav.php')
| -rw-r--r-- | lib/personalgroupnav.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php index 25db5baa9..1f543b897 100644 --- a/lib/personalgroupnav.php +++ b/lib/personalgroupnav.php @@ -87,8 +87,11 @@ class PersonalGroupNav extends Widget if ($nickname) { $user = User::staticGet('nickname', $nickname); $user_profile = $user->getProfile(); + $name = $user_profile->getBestName(); } else { + // @fixme can this happen? is this valid? $user_profile = false; + $name = $nickname; } $this->out->elementStart('ul', array('class' => 'nav')); @@ -97,22 +100,22 @@ class PersonalGroupNav extends Widget $this->out->menuItem(common_local_url('all', array('nickname' => $nickname)), _('Personal'), - sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)), + sprintf(_('%s and friends'), $name), $action == 'all', 'nav_timeline_personal'); $this->out->menuItem(common_local_url('replies', array('nickname' => $nickname)), _('Replies'), - sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)), + sprintf(_('Replies to %s'), $name), $action == 'replies', 'nav_timeline_replies'); $this->out->menuItem(common_local_url('showstream', array('nickname' => $nickname)), _('Profile'), - ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname, + $name, $action == 'showstream', 'nav_profile'); $this->out->menuItem(common_local_url('showfavorites', array('nickname' => $nickname)), _('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'); $cur = common_current_user(); |