diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-15 14:57:23 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-15 14:57:23 +0100 |
| commit | 9bf367e7f803d6968dc2c639624ce191d538a5bc (patch) | |
| tree | 5ef8bec79c46d548d198ca87bbbc9b16974bb5a5 /lib/ocs | |
| parent | 3a9ec452729bf9b6a51d36750b095d9ef80a5f7e (diff) | |
| parent | bb9cc227c2583adc6b51a1f6d75a9fc8333836b9 (diff) | |
| download | nextcloud-server-9bf367e7f803d6968dc2c639624ce191d538a5bc.tar.gz nextcloud-server-9bf367e7f803d6968dc2c639624ce191d538a5bc.zip | |
merge master into filesystem
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 58c906d7256..7c29061c324 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 |