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 /actions/joingroup.php | |
| parent | 6d308f6ffe3f894c60fafaea3ceaef86d30dfe1d (diff) | |
| parent | 97ee517680979bf12e82eab99ecf943712fe97c9 (diff) | |
Merge branch '0.8.x' into invite-enabled
Diffstat (limited to 'actions/joingroup.php')
| -rw-r--r-- | actions/joingroup.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actions/joingroup.php b/actions/joingroup.php index a5d82ddc7..0e4f96eaf 100644 --- a/actions/joingroup.php +++ b/actions/joingroup.php @@ -96,6 +96,11 @@ class JoingroupAction extends Action return false; } + if (Group_block::isBlocked($this->group, $cur->getProfile())) { + $this->clientError(_('You have been blocked from that group by the admin.'), 403); + return false; + } + return true; } |