aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@owncloud.com>2016-05-24 16:18:27 +0200
committerChristoph Wurst <christoph@owncloud.com>2016-05-24 18:02:52 +0200
commita922957f768b61dcd12fa166488c5a9017b57428 (patch)
treed7f0e4d03948417986dcd97a2902e39f72332034 /lib
parent28ce7dd262fbf748c46b915b67ac6c332fed8420 (diff)
downloadnextcloud-server-a922957f768b61dcd12fa166488c5a9017b57428.tar.gz
nextcloud-server-a922957f768b61dcd12fa166488c5a9017b57428.zip
add default token auth config on install, upgrade and add it to sample config
Diffstat (limited to 'lib')
-rw-r--r--lib/private/User/Session.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index cd867dace76..c77cfedba4c 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -368,6 +368,9 @@ class Session implements IUserSession, Emitter {
array('uid' => &$username)
);
$user = $this->manager->get($username);
+ if (is_null($user)) {
+ return true;
+ }
// DI not possible due to cyclic dependencies :'-/
return OC::$server->getTwoFactorAuthManager()->isTwoFactorAuthenticated($user);
}