]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Fix for regression: fatal error on group page display when not logged in.
authorBrion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 19:19:19 +0000 (12:19 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 19:19:19 +0000 (12:19 -0700)
Bug was introduced with group deletion feature.

actions/showgroup.php

index 9a12bafaf62aba1b4ff763738f1125c558f8cf19..8e8ff717c112a0d2f7ba5544288089630b62d49e 100644 (file)
@@ -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();