diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:18:35 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:18:35 +0800 |
| commit | 65f784120b45dc187e28313fa2c2dca2c976c150 (patch) | |
| tree | cf1cb3e34483466d4f4a312c528579292e7603fc /lib/grouplist.php | |
| parent | f7d488d4b2bfdc8dfa6b5a2bc2931dbf824509a0 (diff) | |
| parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) | |
Merge branch '0.8.x' into notice-search-no-results
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(); } |