diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-31 09:05:35 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-31 09:05:35 +0100 |
| commit | 64bfd21ccd25231b86ba4c3b95993dc205c8ea3b (patch) | |
| tree | f8427f09afca56da54433331caabbd5e9385d21b /lib | |
| parent | edafd29630f5866f10f331e69ba34cf26681782b (diff) | |
| parent | 8f50d7680b0cb280a545685d26873a6c3d428aa3 (diff) | |
| download | nextcloud-server-64bfd21ccd25231b86ba4c3b95993dc205c8ea3b.tar.gz nextcloud-server-64bfd21ccd25231b86ba4c3b95993dc205c8ea3b.zip | |
Merge branch 'master' into fix_privatedata
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/api.php | 3 | ||||
| -rwxr-xr-x | lib/private/util.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index 26091657b31..7e69a6a77d2 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -250,7 +250,8 @@ class OC_API { // reuse existing login $loggedIn = OC_User::isLoggedIn(); - if ($loggedIn === true) { + $ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false; + if ($loggedIn === true && $ocsApiRequest) { return OC_User::getUser(); } diff --git a/lib/private/util.php b/lib/private/util.php index f63884c0f32..176eb4bc369 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -579,6 +579,7 @@ class OC_Util { * @return void */ public static function checkAdminUser() { + OC_Util::checkLoggedIn(); if( !OC_User::isAdminUser(OC_User::getUser())) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' )); exit(); @@ -611,6 +612,7 @@ class OC_Util { * @return array $groups where the current user is subadmin */ public static function checkSubAdminUser() { + OC_Util::checkLoggedIn(); if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' )); exit(); |