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/phpbb/ucp/controller/reset_password.php | |
| 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/phpbb/ucp/controller/reset_password.php')
| -rw-r--r-- | phpBB/phpbb/ucp/controller/reset_password.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 7bd1b20cb3..5c27c4f414 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -173,7 +173,7 @@ class reset_password 'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type,' . ' user_lang, user_inactive_reason, reset_token, reset_token_expiration', 'FROM' => [$this->users_table => 'u'], - 'WHERE' => "user_email_hash = '" . $this->db->sql_escape(phpbb_email_hash($email)) . "'" . + 'WHERE' => "user_email = '" . $this->db->sql_escape($email) . "'" . (!empty($username) ? " AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'" : ''), ]; |