diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
| commit | 280f8faab4f692ff7f4389f82397adfa6db56325 (patch) | |
| tree | 94a076bfb3d13c7e6699e0149ee75fff6801880c /lib/grouplist.php | |
| parent | bb3361467c002e38aa3a424672f332b32a647e17 (diff) | |
| parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) | |
Merge branch '0.8.x' into small-fixes
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
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(); } |