mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/rxu/10117' into develop-olympus

Browse Source 
* ticket/rxu/10117:
  [ticket/10117] Add one more missed 'u' modifier, add code comment
  [ticket/10117] Make smilies to be correctly parsed within unicode text.
This commit is contained in:
Oleg Pudeyev 2011-04-17 00:31:24 -04:00
commit 76bc4c24a5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/message_parser.php
View File

@ -1332,7 +1332,9 @@ class parse_message extends bbcode_firstpass
{ {
if ($max_smilies) if ($max_smilies)
{ {
$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#', $this->message, $matches); // 'u' modifier has been added to correctly parse smilies within unicode strings
// For details: http://tracker.phpbb.com/browse/PHPBB3-10117
$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#u', $this->message, $matches);
unset($matches); unset($matches);
if ($num_matches !== false && $num_matches > $max_smilies) if ($num_matches !== false && $num_matches > $max_smilies)
@ -1343,7 +1345,10 @@ class parse_message extends bbcode_firstpass
} }
// Make sure the delimiter # is added in front and at the end of every element within $match // 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)); // 'u' modifier has been added to correctly parse smilies within unicode strings
// For details: http://tracker.phpbb.com/browse/PHPBB3-10117
$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#u' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#u'), $replace, $this->message));
} }
} }