aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/message_parser.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e9729445f2..311c75b410 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1060,8 +1060,8 @@ class parse_message extends bbcode_firstpass
$replace = array("\\1:");
$this->message = preg_replace($match, $replace, trim($this->message));
- // Message length check. -1 disables this check completely.
- if ($config['max_' . $mode . '_chars'])
+ // Message length check. 0 disables this check completely.
+ if ($config['max_' . $mode . '_chars'] > 0)
{
$msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
@@ -1072,6 +1072,13 @@ class parse_message extends bbcode_firstpass
}
}
+ // Check for "empty" message
+ if (!utf8_clean_string($this->message))
+ {
+ $this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
+ return $this->warn_msg;
+ }
+
// Prepare BBcode (just prepares some tags for better parsing)
if ($allow_bbcode && strpos($this->message, '[') !== false)
{