Mercurial > defr > drupal > core

comparison modules/user/user.module @ 9:acef7ccb09b5 6.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drupal 6.4
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:32:08 +0100
parents fff6d4c8c043
children 589fb7c02327
comparison
equal deleted inserted replaced
8:85cbd6048071 9:acef7ccb09b5
1 <?php 1 <?php
2 // $Id: user.module,v 1.892.2.5 2008/07/09 21:48:28 goba Exp $ 2 // $Id: user.module,v 1.892.2.6 2008/08/12 05:11:22 dries Exp $
3 3
4 /** 4 /**
5 * @file 5 * @file
6 * Enables the user registration and login system. 6 * Enables the user registration and login system.
7 */ 7 */
1385 * populated based on $name. 1385 * populated based on $name.
1386 */ 1386 */
1387 function user_external_login_register($name, $module) { 1387 function user_external_login_register($name, $module) {
1388 global $user; 1388 global $user;
1389 1389
1390 $user = user_load(array('name' => $name)); 1390 $existing_user = user_load(array('name' => $name));
1391 if (!isset($user->uid)) { 1391 if (isset($existing_user->uid)) {
1392 $user = $existing_user;
1393 }
1394 else {
1392 // Register this new user. 1395 // Register this new user.
1393 $userinfo = array( 1396 $userinfo = array(
1394 'name' => $name, 1397 'name' => $name,
1395 'pass' => user_password(), 1398 'pass' => user_password(),
1396 'init' => $name, 1399 'init' => $name,