resolve conflicts

darcs-hash:20081210014619-5ed1f-b78d0990f80f7fee6f31424bc1e366d08767af9d.gz

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 8ac83639839f7e6828372f5a36476b2f1e650900..766a08b208a60778e9edccc3ce1345d86e29a58f 100644 (file)
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -218,27 +218,27 @@ class FinishopenidloginAction extends Action {
                                $location = $sreg['country'];
                        }
                }
-               
+
                if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
                        $fullname = $sreg['fullname'];
                }
-               
+
                if ($sreg['email'] && Validate::email($sreg['email'], true)) {
                        $email = $sreg['email'];
                }
 
                # XXX: add language
                # XXX: add timezone
-               
-               $user = User::register(array('nickname' => $nickname, 
+
+               $user = User::register(array('nickname' => $nickname,
                                                                         'email' => $email,
-                                                                        'fullname' => $fullname, 
+                                                                        'fullname' => $fullname,
                                                                         'location' => $location));
 
                $result = oid_link_user($user->id, $canonical, $display);
-               
-               oid_set_last($display);                                                    
-               common_set_user($user->nickname);
+
+               oid_set_last($display);
+               common_set_user($user);
                common_real_login(true);
         if (isset($_SESSION['openid_rememberme']) && $_SESSION['openid_rememberme']) {
                        common_rememberme($user);
@@ -303,7 +303,6 @@ class FinishopenidloginAction extends Action {
 
                # Try the passed-in nickname
 
-
                if ($sreg['nickname']) {
                        $nickname = $this->nicknamize($sreg['nickname']);
                        if ($this->is_new_nickname($nickname)) {