From 9db1abf5aa19d620adcb843e074bc165812efb70 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 8 Aug 2008 19:48:43 +0000
Subject: - Patch #165642 by Damien Tournoud et al: fixed SQL error.

---
 modules/user/user.module | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules')

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,
-- 
cgit v1.2.3