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

Remove comparison with member variable of null variable, cleaned code a bit.

Browse Source
This commit is contained in:
Adrian Lang 2009-03-07 01:43:55 +01:00
parent a547c5f642
commit 00c14d22de
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/profilelist.php
View File

@ -89,6 +89,7 @@ class ProfileList extends Widget
'id' => 'profile-' . $this->profile->id)); 'id' => 'profile-' . $this->profile->id));
$user = common_current_user(); $user = common_current_user();
$is_own = !is_null($user) && ($user->id === $this->user->id);
$this->out->elementStart('div', 'entity_profile vcard'); $this->out->elementStart('div', 'entity_profile vcard');
@ -154,7 +155,7 @@ class ProfileList extends Widget
$this->out->elementStart('dl', 'entity_tags'); $this->out->elementStart('dl', 'entity_tags');
$this->out->elementStart('dt'); $this->out->elementStart('dt');
if ($user->id == $this->owner->id) { if ($is_own) {
$this->out->element('a', array('href' => common_local_url('tagother', $this->out->element('a', array('href' => common_local_url('tagother',
array('id' => $this->profile->id))), array('id' => $this->profile->id))),
_('Tags')); _('Tags'));
@ -183,7 +184,7 @@ class ProfileList extends Widget
$this->out->elementEnd('dl'); $this->out->elementEnd('dl');
} }
if ($user && $user->id == $this->owner->id) { if ($is_own) {
$this->showOwnerControls($this->profile); $this->showOwnerControls($this->profile);
} }
@ -193,11 +194,11 @@ class ProfileList extends Widget
$this->out->elementStart('ul'); $this->out->elementStart('ul');
if ($user && $user->id != $this->profile->id) { if (!$is_own) {
# XXX: special-case for user looking at own # XXX: special-case for user looking at own
# subscriptions page # subscriptions page
$this->out->elementStart('li', 'entity_subscribe'); $this->out->elementStart('li', 'entity_subscribe');
if ($user->isSubscribed($this->profile)) { if (!is_null($user) && $user->isSubscribed($this->profile)) {
$usf = new UnsubscribeForm($this->out, $this->profile); $usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show(); $usf->show();
} else { } else {
@ -206,9 +207,6 @@ class ProfileList extends Widget
} }
$this->out->elementEnd('li'); $this->out->elementEnd('li');
$this->out->elementStart('li', 'entity_block'); $this->out->elementStart('li', 'entity_block');
if ($user && $user->id == $this->owner->id) {
$this->showBlockForm();
}
$this->out->elementEnd('li'); $this->out->elementEnd('li');
} }

2
lib/subgroupnav.php
View File

@ -98,7 +98,7 @@ class SubGroupNav extends Widget
$this->user->nickname), $this->user->nickname),
$action == 'usergroups', $action == 'usergroups',
'nav_usergroups'); 'nav_usergroups');
if ($this->user->id == $cur->id) { if (!is_null($cur) && $this->user->id === $cur->id) {
$this->out->menuItem(common_local_url('invite'), $this->out->menuItem(common_local_url('invite'),
_('Invite'), _('Invite'),
sprintf(_('Invite friends and colleagues to join you on %s'), sprintf(_('Invite friends and colleagues to join you on %s'),