mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix warning with token login 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-11-16 16:33:56 +01:00
parent 61453f5fd5
commit 0e88b519d1
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/User/Session.php
View File

@ -529,7 +529,7 @@ class Session implements IUserSession, Emitter {
$this->manager->emit('\OC\User', 'postLogin', array($user, $password)); $this->manager->emit('\OC\User', 'postLogin', array($user, $password));
if ($this->isLoggedIn()) { if ($this->isLoggedIn()) {
$this->prepareUserLogin(); $this->prepareUserLogin(false); // token login cant be the first
} else { } else {
// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory // 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'); $message = \OC::$server->getL10N('lib')->t('Login canceled by app');