diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
| commit | b2e8d8407cc7f1abb5e8767cd3403ac356775eaa (patch) | |
| tree | 5cfaed5f1f21a697e147b41695c7e8c5282324a3 /actions/makeadmin.php | |
| parent | 3833dc8c1f3f9ba5e3b12bf2715e4a4fb3adabf1 (diff) | |
| parent | 4e6f587f868d71f08c618d0dedf6ddf0331619c2 (diff) | |
Merge branch 'testing' 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; } |