diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-11-02 18:32:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 18:32:38 +0100 |
commit | e6b52ef4cd1a92004895320d52f08b44a8b422d3 (patch) | |
tree | f83153d562040f0a2c4f4b34abb42acbd1edc0a8 /lib/private/Server.php | |
parent | e81d04cd8d2ac0de3d06d4586550469384c5d91a (diff) | |
parent | 4da6b20e768574e2ec6a7da590273e18b64ddda5 (diff) | |
download | nextcloud-server-e6b52ef4cd1a92004895320d52f08b44a8b422d3.tar.gz nextcloud-server-e6b52ef4cd1a92004895320d52f08b44a8b422d3.zip |
Merge pull request #1347 from nextcloud/bring-back-remember-me
fix remember me login
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r-- | lib/private/Server.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 3ea358498da..6f25098eb35 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -245,7 +245,7 @@ class Server extends ServerContainer implements IServerContainer { $defaultTokenProvider = null; } - $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig()); + $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom()); $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password)); }); @@ -286,7 +286,7 @@ class Server extends ServerContainer implements IServerContainer { return $userSession; }); - $this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function (Server $c) { + $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) { return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig()); }); |