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 /actions/showgroup.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 'actions/showgroup.php')
| -rw-r--r-- | actions/showgroup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 3ce45adc6..537f09278 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -283,7 +283,7 @@ class ShowgroupAction extends Action if ($cur->isMember($this->group)) { $lf = new LeaveForm($this, $this->group); $lf->show(); - } else { + } else if (!Group_block::isBlocked($this->group, $cur->getProfile())) { $jf = new JoinForm($this, $this->group); $jf->show(); } |