diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-01-24 13:14:31 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-01-24 13:14:31 +0000 |
| commit | 0a1b040588654b82baa7c258b02355081873b775 (patch) | |
| tree | 67b46a1974bd3247e413c969d2b127d111baebf9 /phpBB/includes/message_parser.php | |
| parent | 61fbde5a72a26a8dd964a529720bdae6e3e14577 (diff) | |
| download | forums-0a1b040588654b82baa7c258b02355081873b775.tar forums-0a1b040588654b82baa7c258b02355081873b775.tar.gz forums-0a1b040588654b82baa7c258b02355081873b775.tar.bz2 forums-0a1b040588654b82baa7c258b02355081873b775.tar.xz forums-0a1b040588654b82baa7c258b02355081873b775.zip | |
BBCode enabled profile fields, removed field_name from profile fields, fixed some uninitialised variable issues, some small conversion issues
git-svn-id: file:///svn/phpbb/trunk@5076 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index bc8ce4033a..bff9d46a59 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -659,13 +659,16 @@ class parse_message extends bbcode_firstpass $replace = array("\n", '', "\n\n"); $this->message = preg_replace($match, $replace, trim($this->message)); - // Message length check - $msg_len = ($mode == 'post') ? strlen($this->message) : strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message)); - - if (!$msg_len || ($config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])) + // Message length check. -1 disables this check completely, even allows empty messsages. + if($config['max_' . $mode . '_chars'] != -1) { - $this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : $user->lang['TOO_MANY_CHARS']; - return $this->warn_msg; + $msg_len = ($mode == 'post') ? strlen($this->message) : strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message)); + + if (!$msg_len || ($config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])) + { + $this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : $user->lang['TOO_MANY_CHARS']; + return $this->warn_msg; + } } // Parse HTML |