mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-04-17 21:24:59 +02:00
parent 79b8b152a6 f905b40ce8
commit 61b199aefb
4 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_user.php
View File

@@ -1942,9 +1942,9 @@ function validate_user_email($email, $allowed_email = false)
return $validate_email;
}
if (($ban_reason = $user->check_ban(false, false, $email, true)) !== false)
if (($ban = $user->check_ban(false, false, $email, true)) !== false)
{
return ($ban_reason === true) ? 'EMAIL_BANNED' : $ban_reason;
return ($ban === true) ? 'EMAIL_BANNED' : (!empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : $ban);
}
if (!$config['allow_emailreuse'])