diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-18 23:31:06 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-18 23:31:06 -0500 |
| commit | 9e28f924c23294a531e4fd15932abd0416d3eb84 (patch) | |
| tree | 760c113cce3958558cbd8c343d6064163835f4ac /lib/subadmin.php | |
| parent | da34e58589152f0c696f4eb802f8a4e3b900de0d (diff) | |
| parent | a17ca3a69aae0dde9aaf24f23aeffdd8658829f0 (diff) | |
| download | nextcloud-server-9e28f924c23294a531e4fd15932abd0416d3eb84.tar.gz nextcloud-server-9e28f924c23294a531e4fd15932abd0416d3eb84.zip | |
Merge branch 'master' into move-datadirectory-checks
Diffstat (limited to 'lib/subadmin.php')
| -rw-r--r-- | lib/subadmin.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/subadmin.php b/lib/subadmin.php index 9e83e6da430..8cda7240ac9 100644 --- a/lib/subadmin.php +++ b/lib/subadmin.php @@ -122,6 +122,11 @@ class OC_SubAdmin{ * @return bool */ public static function isSubAdmin($uid) { + // Check if the user is already an admin + if(OC_Group::inGroup($uid, 'admin' )) { + return true; + } + $stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ?'); $result = $stmt->execute(array($uid)); $result = $result->fetchRow(); @@ -141,7 +146,7 @@ class OC_SubAdmin{ if(!self::isSubAdmin($subadmin)) { return false; } - if(OC_Group::inGroup($user, 'admin')) { + if(OC_User::isAdminUser($user)) { return false; } $accessiblegroups = self::getSubAdminsGroups($subadmin); |