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

Handle groups better in Ostatus_profile->updateAvatar

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-01-27 13:38:11 +01:00
parent c8e0000c49
commit cdd3c52633
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,10 +113,13 @@ class Ostatus_profile extends Managed_DataObject
*/ */
public function localGroup() public function localGroup()
{ {
if ($this->group_id) { $group = User_group::getKV('id', $this->group_id);
return User_group::getKV('id', $this->group_id);
if (!$group instanceof User_group) {
throw new NoSuchGroupException(array('id'=>$this->group_id));
} }
return null;
return $group;
} }
/** /**
@ -1252,19 +1255,7 @@ class Ostatus_profile extends Managed_DataObject
throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url)); throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
} }
if ($this->isGroup()) {
// FIXME: throw exception for localGroup
$self = $this->localGroup();
} else {
// this throws an exception already
$self = $this->localProfile(); $self = $this->localProfile();
}
if (!$self) {
throw new ServerException(sprintf(
// TRANS: Server exception. %s is a URI.
_m('Tried to update avatar for unsaved remote profile %s.'),
$this->getUri()));
}
// @todo FIXME: This should be better encapsulated // @todo FIXME: This should be better encapsulated
// ripped from oauthstore.php (for old OMB client) // ripped from oauthstore.php (for old OMB client)