restructuring of User::registerNew() lost password munging

This commit is contained in:
Evan Prodromou 2010-02-01 00:47:50 -05:00
parent 5d2c083899
commit f9cb1c3265
1 changed files with 3 additions and 4 deletions

View File

@ -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();