diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-18 21:06:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-18 21:06:00 +0100 |
| commit | 9872316cac4df4987fdabc9512ca6ebeb7e5e04f (patch) | |
| tree | 797b82fb3f2626a49de12de69774664a04f47ad1 /phpBB/includes/ucp | |
| parent | aed7e369c30bb724a1496fbda34707280a56ea22 (diff) | |
| download | forums-9872316cac4df4987fdabc9512ca6ebeb7e5e04f.tar forums-9872316cac4df4987fdabc9512ca6ebeb7e5e04f.tar.gz forums-9872316cac4df4987fdabc9512ca6ebeb7e5e04f.tar.bz2 forums-9872316cac4df4987fdabc9512ca6ebeb7e5e04f.tar.xz forums-9872316cac4df4987fdabc9512ca6ebeb7e5e04f.zip | |
[ticket/16167] Remove uses of user_email_hash
PHPBB3-16167
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_resend.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 6d98362e08..dca7e7eeb7 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -131,7 +131,6 @@ class ucp_profile 'username' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'], 'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'], 'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'], - 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? phpbb_email_hash($data['email']) : $user->data['user_email_hash'], 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? $passwords_manager->hash($data['new_password']) : $user->data['user_password'], ); diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 44c54100cd..55923668d4 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -47,7 +47,7 @@ class ucp_resend $sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason FROM ' . USERS_TABLE . " - WHERE user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "' + WHERE user_email = '" . $db->sql_escape($email) . "' AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; $result = $db->sql_query($sql); $user_row = $db->sql_fetchrow($result); |