summaryrefslogtreecommitdiff
path: root/actions/makeadmin.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-06 11:36:59 +0100
committerEvan Prodromou <evan@status.net>2010-02-06 11:36:59 +0100
commit5fdcd88176010a72b6a157170784a8aad7bf4131 (patch)
treeb413d0f615ba48a0814a4c76365c831be8af0782 /actions/makeadmin.php
parent823939ca84bd19ced394771d3f08b7c72a9dec84 (diff)
Moderator can make users admins of a group
Diffstat (limited to 'actions/makeadmin.php')
-rw-r--r--actions/makeadmin.php3
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;
}