diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 12:08:17 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 12:08:17 -0400 |
commit | 4d01f8fbb650ea246d24ebde1001c8c42f98faa4 (patch) | |
tree | 8ba2e1d32c2e84ab80c350097943e2f316fda0f9 /classes/User.php | |
parent | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (diff) |
save a URI with the user
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php index 080e338fe..b85192b29 100644 --- a/classes/User.php +++ b/classes/User.php @@ -282,7 +282,13 @@ class User extends Memcached_DataObject } $user->id = $id; - $user->uri = common_user_uri($user); + + if (!empty($uri)) { + $user->uri = $uri; + } else { + $user->uri = common_user_uri($user); + } + if (!empty($password)) { // may not have a password for OpenID users $user->password = common_munge_password($password, $id); } |