diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
commit | 02d7167906b63d490db3b5c3848accc5235b220f (patch) | |
tree | 92323dec8d456fdc737ee3a74c48dedf4cb92bcd /lib/noticelist.php | |
parent | d260d841ebae71acf7bf726f52acaa6391ce1824 (diff) | |
parent | 60f737dc1eb2f126bae28ce095bc2d17a22bd7d9 (diff) |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'lib/noticelist.php')
-rw-r--r-- | lib/noticelist.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php index 7c88c33cc..9fc0126b3 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -203,11 +203,14 @@ class NoticeListItem extends Widget function showNoticeOptions() { - $this->out->elementStart('div', 'notice-options'); - $this->showFaveForm(); - $this->showReplyLink(); - $this->showDeleteLink(); - $this->out->elementEnd('div'); + $user = common_current_user(); + if ($user) { + $this->out->elementStart('div', 'notice-options'); + $this->showFaveForm(); + $this->showReplyLink(); + $this->showDeleteLink(); + $this->out->elementEnd('div'); + } } /** @@ -282,8 +285,8 @@ class NoticeListItem extends Widget $avatar = $this->profile->getAvatar($avatar_size); $this->out->element('img', array('src' => ($avatar) ? - common_avatar_display_url($avatar) : - common_default_avatar($avatar_size), + $avatar->displayUrl() : + Avatar::defaultImage($avatar_size), 'class' => 'avatar photo', 'width' => $avatar_size, 'height' => $avatar_size, |