X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=wcfsetup%2Finstall%2Ffiles%2Flib%2Fsystem%2Fbbcode%2FSimpleMessageParser.class.php;h=1ef72aa3a2cde88f7e8128883d31b19d86b243b7;hb=e5f9b56cd266af136ed059cdff56041fddc96517;hp=53c6875e95e6ebeb00714519efd227b983a63654;hpb=ef1f5b4a0268d7d70cc2bd4152853d59801660cf;p=GitHub%2FWoltLab%2FWCF.git

diff --git a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
index 53c6875e95..1ef72aa3a2 100644
--- a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
@@ -63,7 +63,7 @@ class SimpleMessageParser extends SingletonFactory {
 				/** @var Smiley $smiley */
 				foreach ($categorySmilies as $smiley) {
 					foreach ($smiley->smileyCodes as $smileyCode) {
-						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'" />';
+						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'">';
 					}
 				}
 			}
@@ -94,8 +94,8 @@ class SimpleMessageParser extends SingletonFactory {
 		// encode html
 		$this->message = StringUtil::encodeHTML($this->message);
 		
-		// converts newlines to <br />'s
-		$this->message = nl2br($this->message);
+		// converts newlines to <br>'s
+		$this->message = nl2br($this->message, false);
 		
 		// parse urls
 		if ($parseURLs) {
@@ -224,7 +224,7 @@ class SimpleMessageParser extends SingletonFactory {
 	public function parseSmilies($text) {
 		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(StringUtil::encodeHTML($code), '~').'(?![^<]*>)~', $html, $text);
-			$text = preg_replace('~(?<=^|\s)'.preg_quote(StringUtil::encodeHTML($code), '~').'(?=$|\s|<br />)~', $html, $text);
+			$text = preg_replace('~(?<=^|\s)'.preg_quote(StringUtil::encodeHTML($code), '~').'(?=$|\s|<br />|<br>)~', $html, $text);
 		}
 		
 		return $text;