Fix postLogin hook

diff --git a/lib/user.php b/lib/user.php
index cd29eb7efdb99e8b42350e971b13588bd6480580..7e5b70c53303bb48abe0de8141d1e667b0d24b45 100644 (file)
--- 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 b0fdcd3e8501b10d62fd17fe497406253511fdd8..fcbebee8f88d1741ca0e196b35682ec7b4fc045e 100644 (file)
--- 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 {