From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 13 May 2015 15:22:52 +0000 (+0200)
Subject: Fixed smiley-parsing in list-tags
X-Git-Tag: 2.1.4~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61b8062377e61b5e6fe98e485b5f46b39b10dbed;p=GitHub%2FWoltLab%2FWCF.git

Fixed smiley-parsing in list-tags
---

diff --git a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
index 581a3612e7..0a4d202725 100644
--- a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
@@ -134,7 +134,7 @@ class MessageParser extends BBCodeParser {
 	protected function parseSmilies($text, $enableHtml = false) {
 		foreach ($this->smilies as $code => $html) {
 			//$text = preg_replace('~(?<!&\w{2}|&\w{3}|&\w{4}|&\w{5}|&\w{6}|&#\d{2}|&#\d{3}|&#\d{4}|&#\d{5})'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?![^<]*>)~', $html, $text);
-			$text = preg_replace('~(?<=^|\s)'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?=$|\s|</li>'.(!$enableHtml ? '|<br />' : '').')~', $html, $text);
+			$text = preg_replace('~(?<=^|\s|<li>)'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?=$|\s|</li>'.(!$enableHtml ? '|<br />' : '').')~', $html, $text);
 		}
 		
 		return $text;