diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
| commit | 00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch) | |
| tree | f5d69cf10ef3fd157a21990a38515c03b74035a1 /lib/json.php | |
| parent | df8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff) | |
| parent | 8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff) | |
| download | nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip | |
merge from master
Diffstat (limited to 'lib/json.php')
| -rw-r--r-- | lib/json.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/json.php b/lib/json.php index cc6cee6caff..204430411c0 100644 --- a/lib/json.php +++ b/lib/json.php @@ -72,7 +72,7 @@ class OC_JSON{ public static function checkSubAdminUser() { self::checkLoggedIn(); self::verifyUser(); - if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { + if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { $l = OC_L10N::get('lib'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); @@ -120,7 +120,7 @@ class OC_JSON{ /** * Encode and print $data in json format */ - public static function encodedPrint($data,$setContentType=true) { + public static function encodedPrint($data, $setContentType=true) { // Disable mimesniffing, don't move this to setContentTypeHeader! header( 'X-Content-Type-Options: nosniff' ); if($setContentType) { |