diff options
| -rw-r--r-- | lib/profilelist.php | 12 | ||||
| -rw-r--r-- | lib/subgroupnav.php | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/profilelist.php b/lib/profilelist.php index 75053b7a4..898200d2d 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -89,6 +89,7 @@ class ProfileList extends Widget 'id' => 'profile-' . $this->profile->id)); $user = common_current_user(); + $is_own = !is_null($user) && ($user->id === $this->user->id); $this->out->elementStart('div', 'entity_profile vcard'); @@ -154,7 +155,7 @@ class ProfileList extends Widget $this->out->elementStart('dl', 'entity_tags'); $this->out->elementStart('dt'); - if ($user->id == $this->owner->id) { + if ($is_own) { $this->out->element('a', array('href' => common_local_url('tagother', array('id' => $this->profile->id))), _('Tags')); @@ -183,7 +184,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } - if ($user && $user->id == $this->owner->id) { + if ($is_own) { $this->showOwnerControls($this->profile); } @@ -193,11 +194,11 @@ class ProfileList extends Widget $this->out->elementStart('ul'); - if ($user && $user->id != $this->profile->id) { + if (!$is_own) { # XXX: special-case for user looking at own # subscriptions page $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->show(); } else { @@ -206,9 +207,6 @@ class ProfileList extends Widget } $this->out->elementEnd('li'); $this->out->elementStart('li', 'entity_block'); - if ($user && $user->id == $this->owner->id) { - $this->showBlockForm(); - } $this->out->elementEnd('li'); } diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php index 5fd8a72a2..31c3ea0b5 100644 --- a/lib/subgroupnav.php +++ b/lib/subgroupnav.php @@ -98,7 +98,7 @@ class SubGroupNav extends Widget $this->user->nickname), $action == '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'), _('Invite'), sprintf(_('Invite friends and colleagues to join you on %s'), |