aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-05 16:10:10 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-05 16:10:10 +0000
commita7984e660da4def80d28a4efeacb5ee861c4718c (patch)
tree18c200ce69257f9611e9fa93ebf4154c4237278b /phpBB/includes/ucp
parent1074925720e84bcb9f2b1b6908da805c132a1c8a (diff)
downloadforums-a7984e660da4def80d28a4efeacb5ee861c4718c.tar
forums-a7984e660da4def80d28a4efeacb5ee861c4718c.tar.gz
forums-a7984e660da4def80d28a4efeacb5ee861c4718c.tar.bz2
forums-a7984e660da4def80d28a4efeacb5ee861c4718c.tar.xz
forums-a7984e660da4def80d28a4efeacb5ee861c4718c.zip
Correctly check empty subjects/messages (Bug #17915)
Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745) Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8306 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 6b56b52a5d..b2e91d8dde 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -494,12 +494,12 @@ function compose_pm($id, $mode, $action)
}
else
{
- if (!$subject || !utf8_clean_string($subject))
+ if (utf8_clean_string($subject) === '')
{
$error[] = $user->lang['EMPTY_MESSAGE_SUBJECT'];
}
- if (!$message)
+ if (utf8_clean_string($message) === '')
{
$error[] = $user->lang['TOO_FEW_CHARS'];
}
@@ -600,7 +600,7 @@ function compose_pm($id, $mode, $action)
// Subject defined
if ($submit)
{
- if (!$subject || !utf8_clean_string($subject))
+ if (utf8_clean_string($subject) === '')
{
$error[] = $user->lang['EMPTY_MESSAGE_SUBJECT'];
}