X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fgrouplist.php;h=1ded5160bdcd655e2c1b2656d7eee3d8af6c3aab;hb=6c3149334cf69a33026a75be9f5ea579b2de3b8d;hp=6801ab42617eb40d876fecccba72066c0c2e2ba4;hpb=5c31dcb4304113e40b4a309a18d83dbdb712813e;p=quix0rs-gnu-social.git

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 6801ab4261..1ded5160bd 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -151,7 +151,7 @@ class GroupList extends Widget
 
         # If we're on a list with an owner (subscriptions or subscribers)...
 
-        if ($user && $user->id == $this->owner->id) {
+        if (!empty($user) && !empty($this->owner) && $user->id == $this->owner->id) {
             $this->showOwnerControls();
         }
 
@@ -166,7 +166,7 @@ class GroupList extends Widget
             if ($user->isMember($this->group)) {
                 $lf = new LeaveForm($this->out, $this->group);
                 $lf->show();
-            } else {
+            } else if (!Group_block::isBlocked($this->group, $user->getProfile())) {
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }