diff options
Diffstat (limited to 'actions/finishopenidlogin.php')
| -rw-r--r-- | actions/finishopenidlogin.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index af5ffdf14..80663f4c9 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -278,6 +278,7 @@ class FinishopenidloginAction extends Action { $profile->delete(); } + common_set_user($user->nickname); common_redirect(common_local_url('profilesettings')); } @@ -334,9 +335,13 @@ class FinishopenidloginAction extends Action { function best_new_nickname($display, $sreg) { # Try the passed-in nickname - - if ($sreg['nickname'] && $this->is_new_nickname($sreg['nickname'])) { - return $sreg['nickname']; + + + if ($sreg['nickname']) { + $nickname = $this->nicknamize($sreg['nickname']); + if ($this->is_new_nickname($nickname)) { + return $nickname; + } } # Try the full name |