GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Cool bug! Technically good PHP syntax

This commit is contained in:
Evan Prodromou 2010-02-20 11:17:54 -05:00
parent 2df3bbc80b
commit ed45df045f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -149,7 +149,6 @@ class Ostatus_profile extends Memcached_DataObject
function asActivityNoun($element)
{
$xs = new XMLStringer(true);
$avatarHref = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
$avatarType = 'image/png';
if ($this->isGroup()) {
@ -173,8 +172,8 @@ class Ostatus_profile extends Memcached_DataObject
$self = $this->localProfile();
$avatar = $self->getAvatar(AVATAR_PROFILE_SIZE);
if ($avatar) {
$avatarHref = $avatar->
$avatarType = $avatar->mediatype;
$avatarHref = $avatar->url;
$avatarType = $avatar->mediatype;
}
}
$xs->elementStart('activity:' . $element);
@ -672,10 +671,10 @@ class Ostatus_profile extends Memcached_DataObject
// Get the canonical feed URI and check it
$discover = new FeedDiscovery();
$feeduri = $discover->discoverFromURL($homeuri);
$huburi = $discover->getAtomLink('hub');
$salmonuri = $discover->getAtomLink('salmon');
if (!$huburi) {
// We can only deal with folks with a PuSH hub
throw new FeedSubNoHubException();