summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/user.module7
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,