diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-06-09 18:56:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-09 18:56:13 +0200 |
| commit | b8151b1299c02506ffa0d665461d85e32cd4cd10 (patch) | |
| tree | cdf07e1fe1e5721e034734ba28b05f780f1f63ed /phpBB/includes/message_parser.php | |
| parent | 89f70673779f1908c8f000c5c053bb377e253254 (diff) | |
| download | forums-b8151b1299c02506ffa0d665461d85e32cd4cd10.tar forums-b8151b1299c02506ffa0d665461d85e32cd4cd10.tar.gz forums-b8151b1299c02506ffa0d665461d85e32cd4cd10.tar.bz2 forums-b8151b1299c02506ffa0d665461d85e32cd4cd10.tar.xz forums-b8151b1299c02506ffa0d665461d85e32cd4cd10.zip | |
[ticket/11711] Improve checks for unsupported characters and check subject
PHPBB3-11711
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index eed892986e..8965b50667 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1198,13 +1198,9 @@ class parse_message extends bbcode_firstpass // not supported by utf8_bin if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches)) { - $character_list = ''; - foreach ($matches[0] as $cur_match) - { - $character_list .= $cur_match . '<br />'; - } - $this->warn_msg[] = $user->lang('UNSUPPORTED_CHARACTERS', $character_list); - return (!$update_this_message) ? $return_message : $this->warn_msg; + $character_list = implode('<br />', $matches[0]); + $this->warn_msg[] = $user->lang('UNSUPPORTED_CHARACTERS_MESSAGE', $character_list); + return $update_this_message ? $this->warn_msg : $return_message; } // Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length. |