wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set nickname correctly

Browse Source 
darcs-hash:20080618061117-84dde-6983ed79c2d0e985fc8b00ac7c270b46d92bc20d.gz
This commit is contained in:
Evan Prodromou 2008-06-18 02:11:17 -04:00
parent 21463458c5
commit 94c4262dcf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/finishopenidlogin.php
View File

@ -278,6 +278,7 @@ class FinishopenidloginAction extends Action {
$profile->delete(); $profile->delete();
} }
common_set_user($user->nickname);
common_redirect(common_local_url('profilesettings')); common_redirect(common_local_url('profilesettings'));
} }
@ -334,9 +335,13 @@ class FinishopenidloginAction extends Action {
function best_new_nickname($display, $sreg) { function best_new_nickname($display, $sreg) {
# Try the passed-in nickname # 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 # Try the full name