diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-20 02:25:56 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-20 02:25:56 +0200 |
| commit | 31037241e11122203f2ea73b6c1b126a14bfdae2 (patch) | |
| tree | c783857d7a61c48d913a252fb05e99e6389fb937 /lib/user.php | |
| parent | 58a8d67a9b3c48567bcc40cc02444311c6773275 (diff) | |
| parent | 71668cf08a57742c0a585c9e2fe7e4bb0ea08165 (diff) | |
| download | nextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.tar.gz nextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/user.php b/lib/user.php index 833e8866592..2bd11022e26 100644 --- a/lib/user.php +++ b/lib/user.php @@ -32,7 +32,7 @@ * post_deleteUser(uid) * pre_setPassword(&run, uid, password) * post_setPassword(uid, password) - * pre_login(&run, uid) + * pre_login(&run, uid, password) * post_login(uid) * logout() */ @@ -244,7 +244,7 @@ class OC_User { */ public static function login( $uid, $password ) { $run = true; - OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid )); + OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid, "password" => $password)); if( $run ) { $uid = self::checkPassword( $uid, $password ); |