summaryrefslogtreecommitdiffstats
path: root/lib/private/User
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@owncloud.com>2016-06-20 09:13:47 +0200
committerChristoph Wurst <christoph@owncloud.com>2016-06-20 09:13:47 +0200
commit9d74ff02a4014d11020e21e5f73beb02bc749697 (patch)
tree0e8a30a61e5b3eed7eff3ce6e5ca2d902952e47a /lib/private/User
parent8ef5431e7a0db3120223fafd336f273cb3a61513 (diff)
downloadnextcloud-server-9d74ff02a4014d11020e21e5f73beb02bc749697.tar.gz
nextcloud-server-9d74ff02a4014d11020e21e5f73beb02bc749697.zip
fix nitpick
Diffstat (limited to 'lib/private/User')
-rw-r--r--lib/private/User/Session.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index cd9e973e306..07235c1b42b 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -454,12 +454,13 @@ class Session implements IUserSession, Emitter {
}
$uid = $dbToken->getUID();
+ $password = '';
try {
$password = $this->tokenProvider->getPassword($dbToken, $token);
- $this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
} catch (PasswordlessTokenException $ex) {
- $this->manager->emit('\OC\User', 'preLogin', array($uid, ''));
+ // Ignore and use empty string instead
}
+ $this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
$user = $this->manager->get($uid);
if (is_null($user)) {