summaryrefslogtreecommitdiff
path: root/lib/activity.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-25 13:40:14 -0800
committerZach Copley <zach@status.net>2010-02-25 13:40:14 -0800
commitbac959ad46e6e04bce8c29f8a24e198e62bf5616 (patch)
tree3ac6ddfe248b68526c56ff8110a5c2ab5ec55d90 /lib/activity.php
parente61edb55d9c92c0c93de3a591928f4760b6cea16 (diff)
parent8278eca7ffe5d8c3e05fead042754640b8169411 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: Not sure how this ended up in wrong-cased dir... OStatus: fix remote groups to work with new user_groups/local_groups split. Conflicts: classes/User_group.php
Diffstat (limited to 'lib/activity.php')
-rw-r--r--lib/activity.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/activity.php b/lib/activity.php
index 0863cf8fa..30cdc5a56 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -641,7 +641,10 @@ class ActivityObject
$object->id = $profile->getUri();
$object->title = $profile->getBestName();
$object->link = $profile->profileurl;
- $object->avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+ if ($avatar) {
+ $object->avatar = $avatar->displayUrl();
+ }
if (isset($profile->lat) && isset($profile->lon)) {
$object->geopoint = (float)$profile->lat . ' ' . (float)$profile->lon;
@@ -709,7 +712,7 @@ class ActivityObject
'rel' => 'avatar',
'href' => empty($this->avatar)
? Avatar::defaultImage(AVATAR_PROFILE_SIZE)
- : $this->avatar->displayUrl()
+ : $this->avatar
),
null
);