From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 31 May 2013 17:58:31 +0000 (+0200)
Subject: Fix postLogin hook
X-Git-Tag: v6.0.0alpha2~688^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cdb2f559a82e3280c546cf9f1de6a0ae225e3f94;p=nextcloud-server.git

Fix postLogin hook
---

diff --git a/lib/user.php b/lib/user.php
index cd29eb7efdb..7e5b70c5330 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -64,7 +64,7 @@ class OC_User {
 			self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', array("run" => true, "uid" => $uid, "password" => $password));
 			});
-			self::$userSession->listen('\OC\User', 'preDeleteUser', function ($user, $password) {
+			self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
 				\OC_Hook::emit('OC_User', 'post_login', array("run" => true, "uid" => $user->getUID(), "password" => $password));
 			});
 			self::$userSession->listen('\OC\User', 'logout', function () {
diff --git a/lib/user/session.php b/lib/user/session.php
index b0fdcd3e850..fcbebee8f88 100644
--- a/lib/user/session.php
+++ b/lib/user/session.php
@@ -116,7 +116,7 @@ class Session implements Emitter {
 		if ($user) {
 			$result = $user->checkPassword($password);
 			if ($result and $user->isEnabled()) {
-				$this->manager->emit('\OC\User', 'postLogin', array($user));
+				$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
 				$this->setUser($user);
 				return true;
 			} else {