diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-11 08:12:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-11 08:12:41 +0000 |
| commit | 10ed58b2c9db5869c7e4136b0e718d1f81706d87 (patch) | |
| tree | 5d7e1304c1e58af7c06f98bf33bbb63b4762830a /phpBB/includes | |
| parent | 8f8cc501929170334efe2c385dbc18758b429f62 (diff) | |
| download | forums-10ed58b2c9db5869c7e4136b0e718d1f81706d87.tar forums-10ed58b2c9db5869c7e4136b0e718d1f81706d87.tar.gz forums-10ed58b2c9db5869c7e4136b0e718d1f81706d87.tar.bz2 forums-10ed58b2c9db5869c7e4136b0e718d1f81706d87.tar.xz forums-10ed58b2c9db5869c7e4136b0e718d1f81706d87.zip | |
prevent posting empty messages with some UTF8-characters as well as fixing conversion in CVS.
git-svn-id: file:///svn/phpbb/trunk@8163 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 11 |
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) { |