diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-17 20:45:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-17 20:45:19 +0200 |
| commit | f905b40ce8bb03309fd87ad32ce424aefe76acd3 (patch) | |
| tree | 03f97f01e51fd178f01086c03f124f3576bf5beb /phpBB/includes/functions_user.php | |
| parent | c8ff4b41096c31a67b7cf534bba78c442d285b73 (diff) | |
| parent | 562601fd9bb7ec7ba9dff9132840ed9b231a7f72 (diff) | |
| download | forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.gz forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.bz2 forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.xz forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.zip | |
Merge pull request #5559 from mrgoldy/ticket/16007
[ticket/16007] Show ban message for OAuth login
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 d86470adf9..fb9241d4aa 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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']) |