diff options
| -rw-r--r-- | actions/finishopenidlogin.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index 8ac836398..766a08b20 100644 --- 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)) { |