diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-14 23:41:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-14 23:41:34 +0100 |
| commit | 388bb6a5e1e8465b11f33f1820f023db271ba9d9 (patch) | |
| tree | 6fee16bd0151b051cfabd97db9d285e6b8b69c29 /lib/ocs | |
| parent | e475c26f1ae3adec2716b4ba59f92382db2bc24e (diff) | |
| parent | 71ae41716a56305ab9509571c0a84311b9f3eb63 (diff) | |
| download | nextcloud-server-388bb6a5e1e8465b11f33f1820f023db271ba9d9.tar.gz nextcloud-server-388bb6a5e1e8465b11f33f1820f023db271ba9d9.zip | |
Merge branch 'master' into fixing-unused-and-undefined-in-master
Diffstat (limited to 'lib/ocs')
| -rw-r--r-- | lib/ocs/cloud.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index da77756822e..faafe9a62dd 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -40,7 +40,7 @@ class OC_OCS_Cloud { public static function getUserQuota($parameters) { $user = OC_User::getUser(); - if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { + if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) { if(OC_User::userExists($parameters['user'])) { // calculate the disc space @@ -82,7 +82,7 @@ class OC_OCS_Cloud { public static function getUserPrivatekey($parameters) { $user = OC_User::getUser(); - if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { + if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) { if(OC_User::userExists($user)) { // calculate the disc space |