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

[ticket/16007] Show ban message for OAuth login

Browse Source 
PHPBB3-16007
This commit is contained in:
mrgoldy
2019-04-02 15:12:52 +02:00
parent 433803287a
commit 68434e6dbc
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_user.php
View File

@@ -1930,9 +1930,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 !empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : 'EMAIL_BANNED';
}
if (!$config['allow_emailreuse'])