diff options
author | Zach Copley <zach@status.net> | 2010-09-21 13:08:01 -0700 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-09-21 13:08:01 -0700 |
commit | 834c09d5a3e14badb018dbf8e08c0b12b7eb60ee (patch) | |
tree | cfb5227e717d2eac4561fa2c5aae6a28c23d7d74 /lib | |
parent | da4463cb765937190e8a202d20ca5d33ecd46beb (diff) | |
parent | 1bc45e191d83633e00df9355aaeda3680d42f777 (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib')
-rw-r--r-- | lib/activityobject.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/activityobject.php b/lib/activityobject.php index 677a48197..444577775 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -430,6 +430,17 @@ class ActivityObject $alink->height = $size; $alink->width = $size; $alink->url = Avatar::defaultImage($size); + + if ($size == AVATAR_PROFILE_SIZE) { + // Hack for Twitter import: we don't have a 96x96 image, + // but we do have a 73x73 image. For now, fake it with that. + $avatar = $profile->getAvatar(73); + if ($avatar) { + $alink = AvatarLink::fromAvatar($avatar); + $alink->height= $size; + $alink->width = $size; + } + } } $object->avatarLinks[] = $alink; |