diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-07-14 14:01:47 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-07-14 14:01:47 +0000 |
| commit | ff07d7f469b8f50f9ab96e040354af6bc7ccc706 (patch) | |
| tree | ef60b24ac2f1ceffc4b45c1abeee5e64b03c1282 /mod/groups/actions | |
| parent | 7dc6d802a7c4d6d936cbd6ec6a4837a109c72268 (diff) | |
| download | elgg-ff07d7f469b8f50f9ab96e040354af6bc7ccc706.tar.gz elgg-ff07d7f469b8f50f9ab96e040354af6bc7ccc706.tar.bz2 | |
Admin users can join groups. Don't request to join a closed group if admin.
git-svn-id: http://code.elgg.org/elgg/trunk@6702 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/actions')
| -rw-r--r-- | mod/groups/actions/join.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php index 1612587c8..55da1a17c 100644 --- a/mod/groups/actions/join.php +++ b/mod/groups/actions/join.php @@ -32,7 +32,7 @@ if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) { - if ($group->isPublicMembership()) + if ($group->isPublicMembership() || $group->canEdit($user->guid)) { if ($group->join($user)) { |