diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-09-09 01:01:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-09-09 01:01:34 +0000 |
| commit | 7b037d5e42cd7761a4ac17263acd10df8264f5b8 (patch) | |
| tree | 017ed499a01e2071c40f90134dddc9f3e80e2c28 /phpBB/includes/message_parser.php | |
| parent | 6f96492dd940702a842c0a95872d0ff43ba4082e (diff) | |
| download | forums-7b037d5e42cd7761a4ac17263acd10df8264f5b8.tar forums-7b037d5e42cd7761a4ac17263acd10df8264f5b8.tar.gz forums-7b037d5e42cd7761a4ac17263acd10df8264f5b8.tar.bz2 forums-7b037d5e42cd7761a4ac17263acd10df8264f5b8.tar.xz forums-7b037d5e42cd7761a4ac17263acd10df8264f5b8.zip | |
Trim emoticon preg
git-svn-id: file:///svn/phpbb/trunk@4490 89ea8834-ac86-4346-8a33-228a782c2dd0
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 . ' ')); } } |