makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16123] Show proper banned email message

Browse source 
PHPBB3-16123
This commit is contained in:
mrgoldy 2019-09-05 15:43:33 +02:00 • committed by Marc Alexander
parent 525c940385
commit 850ea776d9
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/functions_user.php
View file

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