forked from GNUsocial/gnu-social
restructuring of User::registerNew() lost password munging
This commit is contained in:
parent
5d2c083899
commit
f9cb1c3265
@ -250,10 +250,6 @@ class User extends Memcached_DataObject
|
||||
|
||||
$user->nickname = $nickname;
|
||||
|
||||
if (!empty($password)) { // may not have a password for OpenID users
|
||||
$user->password = common_munge_password($password, $id);
|
||||
}
|
||||
|
||||
// Users who respond to invite email have proven their ownership of that address
|
||||
|
||||
if (!empty($code)) {
|
||||
@ -286,6 +282,9 @@ class User extends Memcached_DataObject
|
||||
|
||||
$user->id = $id;
|
||||
$user->uri = common_user_uri($user);
|
||||
if (!empty($password)) { // may not have a password for OpenID users
|
||||
$user->password = common_munge_password($password, $id);
|
||||
}
|
||||
|
||||
$result = $user->insert();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user