set nickname correctly

darcs-hash:20080618061117-84dde-6983ed79c2d0e985fc8b00ac7c270b46d92bc20d.gz

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index af5ffdf14d6b27c9166ad666fa1d10f87b9e16c3..80663f4c95c442de04694c1c00a03c5ada2336a6 100644 (file)
--- 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