Merge branch 'fix-setpassword' into 'nightly'

Fix /scripts/setpassword.php

common_munge_password is expecting a Profile, we were passing a user_id.

Thanks @aroque for the fix ( ref. #100 )

See merge request !67
This commit is contained in:
mmn 2015-12-14 20:37:26 +00:00
commit 129bd1bf03

View File

@ -50,7 +50,7 @@ if (!$user) {
$original = clone($user); $original = clone($user);
$user->password = common_munge_password($password, $user->id); $user->password = common_munge_password($password, $user->getProfile());
if (!$user->update($original)) { if (!$user->update($original)) {
print "Error updating user '$nickname'.\n"; print "Error updating user '$nickname'.\n";