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 1b854749982198e68f89de742d2c1fd306e3ce1c..1ded5160bdcd655e2c1b2656d7eee3d8af6c3aab 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -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();
             }