summaryrefslogtreecommitdiff
path: root/lib/activity.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-25 21:21:03 -0500
committerEvan Prodromou <evan@status.net>2010-02-25 21:21:03 -0500
commit195e0466ecafaeefab7f8d12e5697e1d46918486 (patch)
treeaf08836068f7948fcfb23575782952a538330d30 /lib/activity.php
parent79e6fd9c85f16a2fccf6f7f8c287eb140ccd4810 (diff)
parentc49fbb63c56cc851153d0fecec81b4ca92b41bc6 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/activity.php')
-rw-r--r--lib/activity.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/activity.php b/lib/activity.php
index 0f30e8bf5..161232c42 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -480,7 +480,7 @@ class AvatarLink
}
$alink = new AvatarLink();
$alink->type = $avatar->mediatype;
- $alink->height = $avatar->mediatype;
+ $alink->height = $avatar->height;
$alink->width = $avatar->width;
$alink->url = $avatar->displayUrl();
return $alink;