diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-26 15:31:42 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-26 15:31:42 +0800 |
| commit | 6328add622641e5f5721cc34d27d4d872c86a561 (patch) | |
| tree | 31be2d91646bc3deed194f7c7e8ad64c9ee17971 /lib/grouplist.php | |
| parent | 6d308f6ffe3f894c60fafaea3ceaef86d30dfe1d (diff) | |
| parent | 97ee517680979bf12e82eab99ecf943712fe97c9 (diff) | |
Merge branch '0.8.x' into invite-enabled
Diffstat (limited to 'lib/grouplist.php')
| -rw-r--r-- | lib/grouplist.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/grouplist.php b/lib/grouplist.php index 1b8547499..1ded5160b 100644 --- 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(); } |