summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 06:15:53 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 06:15:53 -0400
commit5cf6174c39dfac99d31d2f3155873cd47239ac93 (patch)
tree50840778a10ba4a4e37bd1da4d9138be0f215d03
parent12e610a22366e6fd8c97a136f0d94b99276de3de (diff)
Fullname is in the profile, not the user object
darcs-hash:20080720101553-533db-3ebe6e3cd4b9e1b937df076b876bc3f9b826f476.gz
-rw-r--r--lib/stream.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/stream.php b/lib/stream.php
index 1dd4c55e7..91829d835 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -38,6 +38,9 @@ class StreamAction extends Action {
if ($nickname) {
$user = User::staticGet('nickname', $nickname);
+ $user_profile = $user->getProfile();
+ } else {
+ $user_profile = false;
}
common_element_start('ul', array('id' => 'nav_views'));
@@ -45,17 +48,17 @@ class StreamAction extends Action {
common_menu_item(common_local_url('all', array('nickname' =>
$nickname)),
_('Personal'),
- sprintf(_('%s and friends'), (($user && $user->fullname) ? $user->fullname : $nickname)),
+ sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
$action == 'all');
common_menu_item(common_local_url('replies', array('nickname' =>
$nickname)),
_('Replies'),
- sprintf(_('Replies to %s'), (($user && $user->fullname) ? $user->fullname : $nickname)),
+ sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
$action == 'replies');
common_menu_item(common_local_url('showstream', array('nickname' =>
$nickname)),
_('Profile'),
- ($user && $user->fullname) ? $user->fullname : $nickname,
+ ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
$action == 'showstream');
common_element_end('ul');
}