Merge branch 'master' into 0.9.x

2010-09-21 12:48:16 -07:00
parent d342899677 1bc45e191d
commit 42dd460d3b
15 changed files with 384 additions and 20 deletions
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -428,6 +428,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;