diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-11 11:05:06 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-11 11:05:06 +0000 |
| commit | 649f27f4d01d1cd8d26fdeb27cfd46eac40f284b (patch) | |
| tree | acc4b2b325ed58633169db5b1a7ed5f144ed26fc /phpBB/profile.php | |
| parent | f3300f49964e1a13d35f503afd31770b4cededda (diff) | |
| download | forums-649f27f4d01d1cd8d26fdeb27cfd46eac40f284b.tar forums-649f27f4d01d1cd8d26fdeb27cfd46eac40f284b.tar.gz forums-649f27f4d01d1cd8d26fdeb27cfd46eac40f284b.tar.bz2 forums-649f27f4d01d1cd8d26fdeb27cfd46eac40f284b.tar.xz forums-649f27f4d01d1cd8d26fdeb27cfd46eac40f284b.zip | |
Removed conflicts ... please indicate why changes are neccessary in some form either here or @ forums :)
git-svn-id: file:///svn/phpbb/trunk@1166 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
| -rw-r--r-- | phpBB/profile.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php index 3978cbd269..0eaf73ccc7 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -6,11 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * -<<<<<<< profile.php * $Id$ -======= - * $Id$ ->>>>>>> 1.112 * * ***************************************************************************/ @@ -1435,7 +1431,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $user_password = generate_password(); $sql = "UPDATE " . USERS_TABLE . " - SET user_active = 0, user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey' + SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey' WHERE user_id = " . $row['user_id']; if( !$result = $db->sql_query($sql) ) { |