summaryrefslogtreecommitdiff
path: root/actions/passwordsettings.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-11-12 20:12:00 -0500
committerCraig Andrews <candrews@integralblue.com>2009-11-12 20:12:36 -0500
commited690615de8f6433a1a4d9a8fc7c28385af47d8a (patch)
tree62ad14f1af970f1fe3de55a5c732011128056f10 /actions/passwordsettings.php
parentcefbad0159c6be0aa6e75c85dd2e4b9f1e412116 (diff)
Added a User_username table that links the external username with a StatusNet user_id
Added EmailAuthenticationPlugin Added ReverseUsernameAuthenticationPlugin Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static
Diffstat (limited to 'actions/passwordsettings.php')
-rw-r--r--actions/passwordsettings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 9e79501e2..11d7bf785 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -170,7 +170,7 @@ class PasswordsettingsAction extends AccountSettingsAction
}
$success = false;
- if(! Event::handle('StartChangePassword', array($user->nickname, $oldpassword, $newpassword))){
+ if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
//no handler changed the password, so change the password internally
$original = clone($user);
@@ -186,7 +186,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->serverError(_('Can\'t save new password.'));
return;
}
- Event::handle('EndChangePassword', array($nickname));
+ Event::handle('EndChangePassword', array($user));
}
$this->showForm(_('Password saved.'), true);