diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-08-08 19:48:43 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-08-08 19:48:43 +0000 |
| commit | 9db1abf5aa19d620adcb843e074bc165812efb70 (patch) | |
| tree | 165c835b433accb6a4989f8ff38136a8c83cb1c1 /modules | |
| parent | 5ebbdd0c362187c3348a15e4a4a9a62fc648179a (diff) | |
| download | brdo-9db1abf5aa19d620adcb843e074bc165812efb70.tar.gz brdo-9db1abf5aa19d620adcb843e074bc165812efb70.tar.bz2 | |
- Patch #165642 by Damien Tournoud et al: fixed SQL error.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user/user.module | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index afc0b77f3..9c5026496 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1367,8 +1367,11 @@ function user_login_submit($form, &$form_state) { function user_external_login_register($name, $module) { global $user; - $user = user_load(array('name' => $name)); - if (!isset($user->uid)) { + $existing_user = user_load(array('name' => $name)); + if (isset($existing_user->uid)) { + $user = $existing_user; + } + else { // Register this new user. $userinfo = array( 'name' => $name, |