wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nitpick

Browse source
This commit is contained in:
Christoph Wurst 2016-06-20 09:13:47 +02:00
parent 8ef5431e7a
commit 9d74ff02a4
No known key found for this signature in database
GPG key ID: FEECD2543CA6EAF0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/User/Session.php
View file

@ -454,12 +454,13 @@ class Session implements IUserSession, Emitter {
} }
$uid = $dbToken->getUID(); $uid = $dbToken->getUID();
$password = '';
try { try {
$password = $this->tokenProvider->getPassword($dbToken, $token); $password = $this->tokenProvider->getPassword($dbToken, $token);
$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
} catch (PasswordlessTokenException $ex) { } 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); $user = $this->manager->get($uid);
if (is_null($user)) { if (is_null($user)) {