save a URI with the user

diff --git a/classes/User.php b/classes/User.php
index 080e338fe7d0fa2d1b389869f37cabf0671f8ac3..b85192b29cce97b9475bd8517da597809b707f72 100644 (file)
--- 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);
             }