? LICENSE.de.txt
? LICENSE.fr.txt
? README.fr.txt
? STATUS.de.txt
? STATUS.fr.txt
? cvs-release-notes.php
? fr.tar.gz
? releases-notes.html
? sec440-upload-bypass-3.patch
? modules/aggregator/translations
? modules/block/translations
? modules/blog/translations
? modules/blogapi/translations
? modules/book/translations
? modules/color/translations
? modules/comment/translations
? modules/contact/translations
? modules/dblog/translations
? modules/filter/translations
? modules/forum/translations
? modules/help/translations
? modules/locale/translations
? modules/menu/translations
? modules/node/translations
? modules/openid/translations
? modules/path/translations
? modules/php/translations
? modules/ping/translations
? modules/poll/translations
? modules/profile/translations
? modules/search/translations
? modules/statistics/translations
? modules/syslog/translations
? modules/system/translations
? modules/taxonomy/translations
? modules/throttle/translations
? modules/tracker/translations
? modules/translation/translations
? modules/trigger/translations
? modules/update/translations
? modules/upload/translations
? modules/user/translations
? profiles/default/translations
? sites/all/modules
? sites/all/themes
? sites/default/files
? sites/default/settings.php
? themes/chameleon/translations
? themes/garland/translations
? themes/garland/images/system.css
? themes/pushbutton/translations
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.892.2.5
diff -u -r1.892.2.5 user.module
--- modules/user/user.module	9 Jul 2008 21:48:28 -0000	1.892.2.5
+++ modules/user/user.module	8 Aug 2008 19:53:35 -0000
@@ -1387,8 +1387,11 @@
 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,