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'] . ' -->';