summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-05-19 10:09:24 -0700
committerMichael Gapczynski <mtgap@owncloud.com>2013-05-19 10:09:24 -0700
commit67729f5f9fe376f998b33ad647458f5f248bd38c (patch)
treebeef4975112adbe003a02f3cb3a42336de272d67
parent694f42dfd5c61b441836bc6c95436006db62a875 (diff)
parent7ec36c5bbb10ea67f2958cd867aa116ffce7ae19 (diff)
downloadnextcloud-server-67729f5f9fe376f998b33ad647458f5f248bd38c.tar.gz
nextcloud-server-67729f5f9fe376f998b33ad647458f5f248bd38c.zip
Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
-rw-r--r--lib/user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/user.php b/lib/user.php
index 226b716188d..b607874afaf 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 );