aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authormrgoldy <gijsmartens1@gmail.com>2019-09-05 15:43:33 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-07 21:58:42 +0200
commit850ea776d9757e6cabc6a176b2071ca7471117a0 (patch)
treec3609d1563a96e3789c3974720752afc02d6f1dc /phpBB/includes/functions_user.php
parent525c940385ef8efb57fb812a8317833d7790e30a (diff)
downloadforums-850ea776d9757e6cabc6a176b2071ca7471117a0.tar
forums-850ea776d9757e6cabc6a176b2071ca7471117a0.tar.gz
forums-850ea776d9757e6cabc6a176b2071ca7471117a0.tar.bz2
forums-850ea776d9757e6cabc6a176b2071ca7471117a0.tar.xz
forums-850ea776d9757e6cabc6a176b2071ca7471117a0.zip
[ticket/16123] Show proper banned email message
PHPBB3-16123
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3bf4aa16b7..35fb54d7d3 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1947,7 +1947,10 @@ function validate_user_email($email, $allowed_email = false)
if (($ban = $user->check_ban(false, false, $email, true)) !== false)
{
- return ($ban === true) ? 'EMAIL_BANNED' : (!empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : $ban);
+ if ($ban !== false)
+ {
+ return !empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : 'EMAIL_BANNED';
+ }
}
if (!$config['allow_emailreuse'])