summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-01 00:47:50 -0500
committerEvan Prodromou <evan@status.net>2010-02-01 00:47:50 -0500
commitf9cb1c32650ff755b79837594fabb20f64e0fe1f (patch)
treea73b0a7111f5310b873682b663ef682a65052f85
parent5d2c0838997824b2f2b9105a1aa269b5a8b79f82 (diff)
restructuring of User::registerNew() lost password munging
-rw-r--r--classes/User.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/User.php b/classes/User.php
index 4013fbc83..0ab816b57 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -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();