diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-01-23 05:37:45 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-01-23 05:37:45 +0000 |
| commit | df25b5f5f533a768532263786c73e4b1356da6fd (patch) | |
| tree | 0523d8fec50985fc6da4ba55b3181d8756291c4c /lib | |
| parent | 240231a8bd7f6b0753070c630ff6b9169e28afe0 (diff) | |
| parent | d98f8c646a40f7ad0e526678fc5cc5dabe469152 (diff) | |
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/noticelist.php | 13 |
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 : |