aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-12 16:14:07 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-12 16:14:07 +0000
commit002dd8155708415b3c1c828789feccbfc087a387 (patch)
tree9c7ec297cc23082f2b5894cd28657f5e7b2492fb /phpBB/includes/message_parser.php
parent2ba03a411e561cb943f8ec8f11afc51eaa720275 (diff)
downloadforums-002dd8155708415b3c1c828789feccbfc087a387.tar
forums-002dd8155708415b3c1c828789feccbfc087a387.tar.gz
forums-002dd8155708415b3c1c828789feccbfc087a387.tar.bz2
forums-002dd8155708415b3c1c828789feccbfc087a387.tar.xz
forums-002dd8155708415b3c1c828789feccbfc087a387.zip
some more fixes
git-svn-id: file:///svn/phpbb/trunk@7875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 3579467bff..e7b7edc169 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1228,6 +1228,11 @@ class parse_message extends bbcode_firstpass
while ($row = $db->sql_fetchrow($result))
{
+ if (empty($row['code']))
+ {
+ continue;
+ }
+
// (assertion)
$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'] . ' -->';