diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-11-27 09:11:18 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-11-27 09:11:18 -0800 |
| commit | 39f9e16f2051b938c611eb5ce3ea871de9cb1cd9 (patch) | |
| tree | 6780ea53f70666e381813ed32043ab92bc9ae884 | |
| parent | 4a78f1268248c811d799d62a54f300f0dd55f0de (diff) | |
| parent | 6deda1b9f6a9f33294fab7ecf6aa60f0347f783b (diff) | |
| download | nextcloud-server-39f9e16f2051b938c611eb5ce3ea871de9cb1cd9.tar.gz nextcloud-server-39f9e16f2051b938c611eb5ce3ea871de9cb1cd9.zip | |
Merge pull request #6086 from owncloud/incognito_mode
return false if user is in incognito mode
| -rw-r--r-- | lib/private/user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 210e5ed3f02..e0d6b9f3f51 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -314,7 +314,7 @@ class OC_User { * Checks if the user is logged in */ public static function isLoggedIn() { - if (\OC::$session->get('user_id')) { + if (\OC::$session->get('user_id') && self::$incognitoMode === false) { OC_App::loadApps(array('authentication')); self::setupBackends(); return self::userExists(\OC::$session->get('user_id')); @@ -353,7 +353,7 @@ class OC_User { * @return bool */ public static function isAdminUser($uid) { - if (OC_Group::inGroup($uid, 'admin')) { + if (OC_Group::inGroup($uid, 'admin') && self::$incognitoMode === false) { return true; } return false; |