diff options
| author | rxu <rxu@mail.ru> | 2011-04-03 00:53:00 +0800 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2011-04-03 00:53:00 +0800 |
| commit | 25ae46b8df36f040f7f3adc1e4aebb4041d79964 (patch) | |
| tree | e774f126fc8a1d16cb2a17eb7974ce576e4ef4f9 /phpBB/includes/message_parser.php | |
| parent | f392f55d9b82cf6e387cf71bd3895d52469c8991 (diff) | |
| download | forums-25ae46b8df36f040f7f3adc1e4aebb4041d79964.tar forums-25ae46b8df36f040f7f3adc1e4aebb4041d79964.tar.gz forums-25ae46b8df36f040f7f3adc1e4aebb4041d79964.tar.bz2 forums-25ae46b8df36f040f7f3adc1e4aebb4041d79964.tar.xz forums-25ae46b8df36f040f7f3adc1e4aebb4041d79964.zip | |
[ticket/10117] Make smilies to be correctly parsed within unicode text.
PHPBB3-10117
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index b2d0b6c566..7c12321d51 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1332,7 +1332,7 @@ class parse_message extends bbcode_firstpass { if ($max_smilies) { - $num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#', $this->message, $matches); + $num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#u', $this->message, $matches); unset($matches); if ($num_matches !== false && $num_matches > $max_smilies) @@ -1343,7 +1343,7 @@ class parse_message extends bbcode_firstpass } // Make sure the delimiter # is added in front and at the end of every element within $match - $this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message)); + $this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#u' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message)); } } |