diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-02-10 11:09:03 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-02-10 11:09:03 +0000 |
| commit | 3d0bc1a3dd16826bf89286f37aa3778e93a34b6b (patch) | |
| tree | 917cbd6dde0d9b47497def39e9dcf12e5433e544 /actions/groupmembers.php | |
| parent | f3c2dfacf4b3b1ce44edcb82d8e76e75e2b7c9fa (diff) | |
| parent | e8428d1d525677fa116236735a43e7b49e8a3fd3 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/groupmembers.php')
| -rw-r--r-- | actions/groupmembers.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 0f47c268d..f16e972a4 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -192,7 +192,9 @@ class GroupMemberListItem extends ProfileListItem { $user = common_current_user(); - if (!empty($user) && $user->id != $this->profile->id && $user->isAdmin($this->group) && + if (!empty($user) && + $user->id != $this->profile->id && + ($user->isAdmin($this->group) || $user->hasRight(Right::MAKEGROUPADMIN)) && !$this->profile->isAdmin($this->group)) { $this->out->elementStart('li', 'entity_make_admin'); $maf = new MakeAdminForm($this->out, $this->profile, $this->group, |