Fix for regression: fatal error on group page display when not logged in.
Bug was introduced with group deletion feature.
This commit is contained in:
parent
b5206fe6ca
commit
9ea7cafd27
@ -298,12 +298,12 @@ class ShowgroupAction extends GroupDesignAction
|
|||||||
|
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
|
|
||||||
|
$cur = common_current_user();
|
||||||
$this->elementStart('div', 'entity_actions');
|
$this->elementStart('div', 'entity_actions');
|
||||||
$this->element('h2', null, _('Group actions'));
|
$this->element('h2', null, _('Group actions'));
|
||||||
$this->elementStart('ul');
|
$this->elementStart('ul');
|
||||||
$this->elementStart('li', 'entity_subscribe');
|
$this->elementStart('li', 'entity_subscribe');
|
||||||
if (Event::handle('StartGroupSubscribe', array($this, $this->group))) {
|
if (Event::handle('StartGroupSubscribe', array($this, $this->group))) {
|
||||||
$cur = common_current_user();
|
|
||||||
if ($cur) {
|
if ($cur) {
|
||||||
if ($cur->isMember($this->group)) {
|
if ($cur->isMember($this->group)) {
|
||||||
$lf = new LeaveForm($this, $this->group);
|
$lf = new LeaveForm($this, $this->group);
|
||||||
@ -316,7 +316,7 @@ class ShowgroupAction extends GroupDesignAction
|
|||||||
Event::handle('EndGroupSubscribe', array($this, $this->group));
|
Event::handle('EndGroupSubscribe', array($this, $this->group));
|
||||||
}
|
}
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
if ($cur->hasRight(Right::DELETEGROUP)) {
|
if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
|
||||||
$this->elementStart('li', 'entity_delete');
|
$this->elementStart('li', 'entity_delete');
|
||||||
$df = new DeleteGroupForm($this, $this->group);
|
$df = new DeleteGroupForm($this, $this->group);
|
||||||
$df->show();
|
$df->show();
|
||||||
|
Loading…
Reference in New Issue
Block a user