summaryrefslogtreecommitdiff
path: root/lib/noticelist.php
diff options
context:
space:
mode:
authorSean Murphy <sgmurphy@gmail.com>2009-02-07 11:02:10 -0500
committerSean Murphy <sgmurphy@gmail.com>2009-02-07 11:02:10 -0500
commita3d5e00f64b3c166e34a8d36fcb4f5b757394e9b (patch)
tree91576e428997bc6cc826fa2cead37794961de23c /lib/noticelist.php
parentd90089314944ed1696f66cabbb6935ea61e4b2e6 (diff)
parent08db50b24eaf9e6e5f651448c394f1f50dd2409b (diff)
Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts: actions/showstream.php
Diffstat (limited to 'lib/noticelist.php')
-rw-r--r--lib/noticelist.php17
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,