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

Remote profiles in AccountProfileBlock generated errors

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-05-10 02:33:36 +02:00
parent 888ac77906
commit d2881757a4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/accountprofileblock.php
View File

@ -51,11 +51,16 @@ class AccountProfileBlock extends ProfileBlock
protected $profile = null; protected $profile = null;
protected $user = null; protected $user = null;
function __construct($out, $profile) function __construct(HTMLOutputter $out, Profile $profile)
{ {
parent::__construct($out); parent::__construct($out);
$this->profile = $profile; $this->profile = $profile;
$this->user = User::getKV('id', $profile->id); try {
$this->user = $this->profile->getUser();
} catch (NoSuchUserException $e) {
// The profile presented is non-local
assert(!$this->profile->isLocal());
}
} }
function avatar() function avatar()
@ -170,7 +175,7 @@ class AccountProfileBlock extends ProfileBlock
} }
$this->out->elementEnd('li'); $this->out->elementEnd('li');
if ($cur->mutuallySubscribed($this->profile)) { if ($this->profile->isLocal() && $cur->mutuallySubscribed($this->profile)) {
// message // message
@ -184,7 +189,7 @@ class AccountProfileBlock extends ProfileBlock
// nudge // nudge
if ($this->user && $this->user->email && $this->user->emailnotifynudge) { if ($this->user->email && $this->user->emailnotifynudge) {
$this->out->elementStart('li', 'entity_nudge'); $this->out->elementStart('li', 'entity_nudge');
$nf = new NudgeForm($this->out, $this->user); $nf = new NudgeForm($this->out, $this->user);
$nf->show(); $nf->show();