diff options
| author | mrgoldy <gijsmartens1@gmail.com> | 2019-04-02 15:12:52 +0200 |
|---|---|---|
| committer | mrgoldy <gijsmartens1@gmail.com> | 2019-04-02 15:12:52 +0200 |
| commit | 68434e6dbc1b87f2bacb246b463d86ebc157473f (patch) | |
| tree | b6abce4147fcb24f2f5818bdaba11dcf491817ed /phpBB/includes/functions_user.php | |
| parent | 433803287ad3eccece6fd5f358fa8dab10516bc6 (diff) | |
| download | forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.gz forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.bz2 forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.xz forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.zip | |
[ticket/16007] Show ban message for OAuth login
PHPBB3-16007
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 5f2dea3b94..5307623c8e 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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']) |