diff options
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index fb7ae99743..e4da2c8ab5 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -645,8 +645,8 @@ class parse_message do { - $match[] = '#(' . preg_quote($row['code'], '#') . ')#'; -// $match[] = "#(?<=.\W|\W.|^\W)" . preg_quote($row['code'], '#') . "(?=.\W|\W.|\W$)#"; +// $match[] = '#(' . preg_quote($row['code'], '#') . ')#'; + $match[] = "#(?<=.\W|\W.|^\W)" . preg_quote($row['code'], '#') . "(?=.\W|\W.|\W$)#"; $replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILE_PATH}/' . $row['smile_url'] . '" border="0" alt="' . $row['emoticon'] . '" title="' . $row['emoticon'] . '" /><!-- s' . $row['code'] . ' -->'; } while ($row = $db->sql_fetchrow($result)); @@ -662,7 +662,7 @@ class parse_message } } - $this->message = preg_replace($match, $replace, ' ' . $this->message . ' '); + $this->message = trim(preg_replace($match, $replace, ' ' . $this->message . ' ')); } } |