makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed conflicts ... please indicate why changes are neccessary in some form either here or @ forums :)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1166 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-10-11 11:05:06 +00:00
parent f3300f4996
commit 649f27f4d0
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/profile.php
View file

@ -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) )
{