aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-05-08 13:36:59 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-05-08 13:36:59 +0000
commitb10f79cacd3a3bdc291baba9020b5ac23a50198f (patch)
tree78c4cfc8608fba5c291cef5b38f35042713af20b /phpBB/includes/message_parser.php
parent17a673375502fdd167ed0cebca052c7624852e67 (diff)
downloadforums-b10f79cacd3a3bdc291baba9020b5ac23a50198f.tar
forums-b10f79cacd3a3bdc291baba9020b5ac23a50198f.tar.gz
forums-b10f79cacd3a3bdc291baba9020b5ac23a50198f.tar.bz2
forums-b10f79cacd3a3bdc291baba9020b5ac23a50198f.tar.xz
forums-b10f79cacd3a3bdc291baba9020b5ac23a50198f.zip
#10635
This should work, it could be made more strict but am leaving it alone for now git-svn-id: file:///svn/phpbb/trunk@7505 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index acb9f50ce6..fee8b88d8c 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1195,7 +1195,7 @@ class parse_message extends bbcode_firstpass
while ($row = $db->sql_fetchrow($result))
{
// (assertion)
- $match[] = '#(?<=^|[\n .])' . preg_quote($row['code'], '#') . '#';
+ $match[] = '#(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)#';
$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
}
$db->sql_freeresult($result);