From 9d74ff02a4014d11020e21e5f73beb02bc749697 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@owncloud.com>
Date: Mon, 20 Jun 2016 09:13:47 +0200
Subject: [PATCH] fix nitpick

---
 lib/private/User/Session.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index cd9e973e30..07235c1b42 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)) {