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

Non-dynamic profile fetching in User and User_group

This commit is contained in:
Mikael Nordfeldth 2014-06-06 00:19:54 +02:00
parent 1217cd59bf
commit c786892103
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/User.php
View File

@ -113,7 +113,7 @@ class User extends Managed_DataObject
);
}
protected $_profile = null;
protected $_profile = array();
/**
* @return Profile
@ -122,14 +122,18 @@ class User extends Managed_DataObject
*/
public function getProfile()
{
if (!($this->_profile instanceof Profile)) {
$this->_profile = Profile::getKV('id', $this->id);
if (!($this->_profile instanceof Profile)) {
throw new UserNoProfileException($this);
}
if (!isset($this->_profile[$this->id])) {
$this->_setProfile(Profile::getKV('id', $this->id));
}
return $this->_profile[$this->id];
}
return $this->_profile;
public function _setProfile(Profile $profile=null)
{
if (!$profile instanceof Profile) {
throw new UserNoProfileException($this);
}
$this->_profile[$this->id] = $profile;
}
public function getUri()

20
classes/User_group.php
View File

@ -74,23 +74,27 @@ class User_group extends Managed_DataObject
);
}
protected $_profile = null;
protected $_profile = array();
/**
* @return Profile
*
* @throws UserNoProfileException if user has no profile
* @throws GroupNoProfileException if user has no profile
*/
public function getProfile()
{
if (!($this->_profile instanceof Profile)) {
$this->_profile = Profile::getKV('id', $this->profile_id);
if (!($this->_profile instanceof Profile)) {
throw new GroupNoProfileException($this);
}
if (!isset($this->_profile[$this->profile_id])) {
$this->_setProfile(Profile::getKV('id', $this->profile_id));
}
return $this->_profile[$this->profile_id];
}
return $this->_profile;
public function _setProfile(Profile $profile=null)
{
if (!$profile instanceof Profile) {
throw new GroupNoProfileException($this);
}
$this->_profile[$this->profile_id] = $profile;
}
public static function defaultLogo($size)