diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-28 12:19:19 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-28 12:19:19 -0700 |
commit | 9ea7cafd27e9037b7d283c4ba6d4c41361195ee9 (patch) | |
tree | 523da41ae3d68dcf05cba8fd67d59fe1ecc5c092 | |
parent | b5206fe6ca455684af46bcf05153716749a611a9 (diff) |
Fix for regression: fatal error on group page display when not logged in.
Bug was introduced with group deletion feature.
-rw-r--r-- | actions/showgroup.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 9a12bafaf..8e8ff717c 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -298,12 +298,12 @@ class ShowgroupAction extends GroupDesignAction $this->elementEnd('div'); + $cur = common_current_user(); $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); $this->elementStart('li', 'entity_subscribe'); if (Event::handle('StartGroupSubscribe', array($this, $this->group))) { - $cur = common_current_user(); if ($cur) { if ($cur->isMember($this->group)) { $lf = new LeaveForm($this, $this->group); @@ -316,7 +316,7 @@ class ShowgroupAction extends GroupDesignAction Event::handle('EndGroupSubscribe', array($this, $this->group)); } $this->elementEnd('li'); - if ($cur->hasRight(Right::DELETEGROUP)) { + if ($cur && $cur->hasRight(Right::DELETEGROUP)) { $this->elementStart('li', 'entity_delete'); $df = new DeleteGroupForm($this, $this->group); $df->show(); |