diff options
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) ) { |