eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Moved Avatar retrieval into Avatar class

Browse Source 
Backwards compatible functions are still in Profile class.
This commit is contained in:
Mikael Nordfeldth
2013-10-06 15:54:06 +02:00
parent c3d46b81a8
commit fb94a16217
10 changed files with 114 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/activityobject.php
View File

@@ -460,9 +460,9 @@ class ActivityObject
$object->link = $profile->profileurl;
try {
$orig = Avatar::getUploaded($profile);
$object->avatarLinks[] = AvatarLink::fromAvatar($orig);
} catch (Exception $e) {
$avatar = Avatar::getUploaded($profile);
$object->avatarLinks[] = AvatarLink::fromAvatar($avatar);
} catch (NoAvatarException $e) {
// Could not find an original avatar to link
}
@@ -475,9 +475,9 @@ class ActivityObject
foreach ($sizes as $size) {
$alink = null;
try {
$avatar = $profile->getAvatar($size);
$avatar = Avatar::byProfile($profile, $size);
$alink = AvatarLink::fromAvatar($avatar);
} catch (Exception $e) {
} catch (NoAvatarException $e) {
$alink = new AvatarLink();
$alink->type = 'image/png';
$alink->height = $size;