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

diff --git a/scripts/setpassword.php b/scripts/setpassword.php
index 3e9f5c17ca3e9ab8473dd8e849e7282eb703ec54..6908ef556a7faeb53ec1ae33ea26c7f8747a65cc 100755 (executable)
--- a/scripts/setpassword.php
+++ b/scripts/setpassword.php
@@ -50,7 +50,7 @@ if (!$user) {
 
 $original = clone($user);
 
-$user->password = common_munge_password($password, $user->id);
+$user->password = common_munge_password($password, $user->getProfile());
 
 if (!$user->update($original)) {
     print "Error updating user '$nickname'.\n";