summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-25 18:52:26 -0800
committerBrion Vibber <brion@pobox.com>2010-02-25 18:52:26 -0800
commit2fa953da22fe932f758882a93106672ab22c1c6d (patch)
tree7724b0de4145e80632714a3c5402efaa8a023b0a /lib
parent2feb09f4346e54805f68a9f677f5a94340875d8e (diff)
parent195e0466ecafaeefab7f8d12e5697e1d46918486 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
-rw-r--r--lib/activity.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/activity.php b/lib/activity.php
index b64a82f0a..b20153213 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -517,7 +517,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;