From 649f27f4d01d1cd8d26fdeb27cfd46eac40f284b Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 11 Oct 2001 11:05:06 +0000 Subject: [PATCH] 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 --- phpBB/profile.php | 6 +----- 1 file changed, 1 insertion(+), 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) ) {