diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-29 17:07:45 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-29 17:07:45 +0100 |
| commit | 73d9699be9d2a343b0573dc6a5bcc65f5f9c7303 (patch) | |
| tree | 59b880d60de8c7712e23faded4ed76cb7d43a899 /lib/private/json.php | |
| parent | c30a68e2f87d0052510f84ca78ad33472d296c18 (diff) | |
| parent | c6f6a8758b3f08e47c3a8f45a67d09698376b2e2 (diff) | |
| download | nextcloud-server-73d9699be9d2a343b0573dc6a5bcc65f5f9c7303.tar.gz nextcloud-server-73d9699be9d2a343b0573dc6a5bcc65f5f9c7303.zip | |
Merge pull request #20135 from owncloud/check-if-null-subadmin
Drop OC_SubAdmin and replace usages
Diffstat (limited to 'lib/private/json.php')
| -rw-r--r-- | lib/private/json.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/json.php b/lib/private/json.php index ac72f02f609..eba374f4da2 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -114,7 +114,13 @@ class OC_JSON{ * @deprecated Use annotation based ACLs from the AppFramework instead */ public static function checkSubAdminUser() { - if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) { + $userObject = \OC::$server->getUserSession()->getUser(); + $isSubAdmin = false; + if($userObject !== null) { + $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject); + } + + if(!$isSubAdmin) { $l = \OC::$server->getL10N('lib'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ))); exit(); |