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/includes/functions_user.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/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 5c94a90d9d..dc6e09268a 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -204,7 +204,6 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'username_clean' => $username_clean, 'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '', 'user_email' => strtolower($user_row['user_email']), - 'user_email_hash' => phpbb_email_hash($user_row['user_email']), 'group_id' => $user_row['group_id'], 'user_type' => $user_row['user_type'], ); @@ -1948,9 +1947,9 @@ function validate_user_email($email, $allowed_email = false) if (!$config['allow_emailreuse']) { - $sql = 'SELECT user_email_hash + $sql = 'SELECT user_email FROM ' . USERS_TABLE . " - WHERE user_email_hash = " . $db->sql_escape(phpbb_email_hash($email)); + WHERE user_email = '" . $db->sql_escape($email) . "'"; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); |