diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-08 21:37:54 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-08 21:37:54 +0200 |
| commit | a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4 (patch) | |
| tree | 8d9aab6160b1f7b951841da8221f1b45c4af2b48 /phpBB/includes | |
| parent | 954c0ddf3e04382e08c0ff417090e6a3325fc290 (diff) | |
| parent | 4abdfd1709d1c39362656de70f95d762e3f031f8 (diff) | |
| download | forums-a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4.tar forums-a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4.tar.gz forums-a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4.tar.bz2 forums-a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4.tar.xz forums-a9a44c295fb4e14cf8e2bb2e798f9017ae8388c4.zip | |
Merge pull request #5679 from mrgoldy/ticket/16123
[ticket/16123] Show proper banned email message
Diffstat (limited to 'phpBB/includes')
| -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']) |