diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-21 14:54:32 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-21 14:54:32 +0100 |
| commit | 2a023c9e15ffd03f07770adf6e8372d3b4e23057 (patch) | |
| tree | 242e90b696746171f94d31bbf7c24afcf0550a92 /phpBB/phpbb/ucp/controller/reset_password.php | |
| parent | 289524938ca527816a902f1a2acb9cf385c2598d (diff) | |
| parent | c628cd7e151a09e25ca0d980620b5fa3fe36a763 (diff) | |
| download | forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.gz forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.bz2 forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.xz forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.zip | |
Merge pull request #5727 from marc1706/ticket/16167
[ticket/16167] Use user_email column for checking duplicates
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)) . "'" : ''), ]; |