summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-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();