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/makeadmin.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/makeadmin.php')
| -rw-r--r-- | actions/makeadmin.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 9ad7d6e7c..f19348648 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -87,7 +87,8 @@ class MakeadminAction extends Action return false; } $user = common_current_user(); - if (!$user->isAdmin($this->group)) { + if (!$user->isAdmin($this->group) && + !$user->hasRight(Right::MAKEGROUPADMIN)) { $this->clientError(_('Only an admin can make another user an admin.'), 401); return false; } |