summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-12-09 20:46:19 -0500
committerEvan Prodromou <evan@controlyourself.ca>2008-12-09 20:46:19 -0500
commitb9fdc2c41904845a7654146326fb52969f1b44dc (patch)
tree1e8963db8f29e693387f0b7cac9e0c48a99d48db
parent407ce3bd8fa6ef6fe3c73d41bb0a0d11e64bac99 (diff)
resolve conflicts
darcs-hash:20081210014619-5ed1f-b78d0990f80f7fee6f31424bc1e366d08767af9d.gz
-rw-r--r--actions/finishopenidlogin.php17
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)) {