diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-19 13:10:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-19 13:10:13 +0000 |
| commit | bc0898f55e2c0bda196fa44cc7d1bb15b6fda649 (patch) | |
| tree | 47192341eaa0ae65e53478ea32d9e0047a523579 /phpBB/includes/acp | |
| parent | 8963b032de7c14151d9432ca208038c4f515d961 (diff) | |
| download | forums-bc0898f55e2c0bda196fa44cc7d1bb15b6fda649.tar forums-bc0898f55e2c0bda196fa44cc7d1bb15b6fda649.tar.gz forums-bc0898f55e2c0bda196fa44cc7d1bb15b6fda649.tar.bz2 forums-bc0898f55e2c0bda196fa44cc7d1bb15b6fda649.tar.xz forums-bc0898f55e2c0bda196fa44cc7d1bb15b6fda649.zip | |
fixing some annoying bugs
git-svn-id: file:///svn/phpbb/trunk@8204 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 344df3169d..833d8e0173 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -322,6 +322,16 @@ class acp_users WHERE user_id = $user_id"; $db->sql_query($sql); } + else + { + // Grabbing the last confirm key - we only send a reminder + $sql = 'SELECT user_actkey + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . $user_id; + $result = $db->sql_query($sql); + $user_actkey = (string) $db->sql_fetchfield('user_actkey'); + $db->sql_freeresult($result); + } $messenger = new messenger(false); @@ -774,8 +784,9 @@ class acp_users if ($update_password) { $sql_ary += array( - 'user_password' => phpbb_hash($data['new_password']), - 'user_passchg' => time(), + 'user_password' => phpbb_hash($data['new_password']), + 'user_passchg' => time(), + 'user_pass_convert' => 0, ); $user->reset_login_keys($user_id); |