diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-06-15 03:26:32 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-06-15 03:26:32 +0000 |
| commit | 8dd5871d4fb15a7996388108550839315e96adad (patch) | |
| tree | eb71a1301d1073a95b169830781999db225f9b97 /lib/grouplist.php | |
| parent | 0bc9b2e730bb6368d36ba5bb3f2df1bf1432adad (diff) | |
| parent | f8da15bf41b07a46b1fbe5323e2b8136d42c5b31 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
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(); } |