aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2016-11-16 16:33:56 +0100
committerRobin Appelman <robin@icewind.nl>2016-11-16 16:33:56 +0100
commit0e88b519d1e285e4fb104cb1623bd6f520157d1d (patch)
tree0c33dc5fac20816453ce133cb80c2a97851b8dc4
parent61453f5fd5eb3e742d1c757def36ce8f6be408f3 (diff)
downloadnextcloud-server-0e88b519d1e285e4fb104cb1623bd6f520157d1d.tar.gz
nextcloud-server-0e88b519d1e285e4fb104cb1623bd6f520157d1d.zip
fix warning with token login
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--lib/private/User/Session.php2
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');