diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-11-17 03:28:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 03:28:39 +0100 |
| commit | 13610ad2d06cd92ecda52c6fa902d677305f5a4b (patch) | |
| tree | 5d18a1064dbe0d2f4d28488c1a1a3c27c91ae731 | |
| parent | ab18d2f55ef2b8de32dc238ef49e0d65d7228f11 (diff) | |
| parent | 0e88b519d1e285e4fb104cb1623bd6f520157d1d (diff) | |
| download | nextcloud-server-13610ad2d06cd92ecda52c6fa902d677305f5a4b.tar.gz nextcloud-server-13610ad2d06cd92ecda52c6fa902d677305f5a4b.zip | |
Merge pull request #2164 from nextcloud/token-login-wanring
fix warning with token login
| -rw-r--r-- | lib/private/User/Session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 6033f060504..a45b1dcd10f 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -529,7 +529,7 @@ class Session implements IUserSession, Emitter { $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); if ($this->isLoggedIn()) { - $this->prepareUserLogin(); + $this->prepareUserLogin(false); // token login cant be the first } else { // injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory $message = \OC::$server->getL10N('lib')->t('Login canceled by app'); |