diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:23:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:23:06 +0200 |
| commit | a7c02304a56e29c0fd4833626ec692a6babcb269 (patch) | |
| tree | 8faf99cb5e786106c1c8ccfa5d2091e2759d2fb0 /phpBB/includes/functions_user.php | |
| parent | d6139846607a4fe3a13d5863b3fa6a52b1fe3c10 (diff) | |
| parent | f0afccb173fb728b6c70a8bd86c4d8869043581a (diff) | |
| download | forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.gz forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.bz2 forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.xz forums-a7c02304a56e29c0fd4833626ec692a6babcb269.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3bf4aa16b7..e0b6a9d0c6 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1945,9 +1945,10 @@ function validate_user_email($email, $allowed_email = false) return $validate_email; } - if (($ban = $user->check_ban(false, false, $email, true)) !== false) + $ban = $user->check_ban(false, false, $email, true); + if (!empty($ban)) { - return ($ban === true) ? 'EMAIL_BANNED' : (!empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : $ban); + return !empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : 'EMAIL_BANNED'; } if (!$config['allow_emailreuse']) |