summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-23 04:55:09 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-23 04:55:09 +0000
commit7afb2be83f2918747e295fe5d1d90a638beff6a7 (patch)
tree19943489559722e17f893eddf30c32338c7b78c5 /lib
parente2afca803df2de87fd242d6462938e7a29716a17 (diff)
parent597245ffc3fc15876f005c98aa585288f4901635 (diff)
Merge branch 'master' of ../trunk
Diffstat (limited to 'lib')
-rw-r--r--lib/noticelist.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 8b0c5f322..20bf3c9f1 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -274,14 +274,19 @@ class NoticeListItem extends Widget
function showAvatar()
{
- $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+ if ('shownotice' === $this->out->trimmed('action')) {
+ $avatar_size = AVATAR_PROFILE_SIZE;
+ } else {
+ $avatar_size = AVATAR_STREAM_SIZE;
+ }
+ $avatar = $this->profile->getAvatar($avatar_size);
$this->out->element('img', array('src' => ($avatar) ?
common_avatar_display_url($avatar) :
- common_default_avatar(AVATAR_STREAM_SIZE),
+ common_default_avatar($avatar_size),
'class' => 'avatar photo',
- 'width' => AVATAR_STREAM_SIZE,
- 'height' => AVATAR_STREAM_SIZE,
+ 'width' => $avatar_size,
+ 'height' => $avatar_size,
'alt' =>
($this->profile->fullname) ?
$this->profile->fullname :