Merge commit 'mainline-write/0.8.x' into 0.8.x

[quix0rs-gnu-social.git] / lib / grouplist.php

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 8e2637fec9626de9615f6243b2e3cba5dd19acee..1ded5160bdcd655e2c1b2656d7eee3d8af6c3aab 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -164,11 +164,9 @@ class GroupList extends Widget
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
-                if (!$user->isAdmin($this->group)) {
-                    $lf = new LeaveForm($this->out, $this->group);
-                    $lf->show();
-                }
-            } else {
+                $lf = new LeaveForm($this->out, $this->group);
+                $lf->show();
+            } else if (!Group_block::isBlocked($this->group, $user->getProfile())) {
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }