From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 6 Feb 2013 00:48:57 +0000 (+0100)
Subject: Reflecting API changes
X-Git-Tag: 2.0.0_Beta_1~111
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02103f9a8a4607ff2141e131dfcea42b050c3ad3;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Reflecting API changes
---

diff --git a/files/lib/data/conversation/message/ConversationMessage.class.php b/files/lib/data/conversation/message/ConversationMessage.class.php
index 21caf4d..1474fd4 100644
--- a/files/lib/data/conversation/message/ConversationMessage.class.php
+++ b/files/lib/data/conversation/message/ConversationMessage.class.php
@@ -80,16 +80,10 @@ class ConversationMessage extends DatabaseObject implements IMessage {
 	 * @return	string
 	 */
 	public function getExcerpt($maxLength = 255) {
-		MessageParser::getInstance()->setOutputType('text/plain');
+		MessageParser::getInstance()->setOutputType('text/simplified-html');
 		$message = MessageParser::getInstance()->parse($this->message, $this->enableSmilies, $this->enableHtml, $this->enableBBCodes);
-		if (StringUtil::length($message) > $maxLength) {
-			$message = StringUtil::encodeHTML(StringUtil::substring($message, 0, $maxLength)).StringUtil::HELLIP;
-		}
-		else {
-			$message = StringUtil::encodeHTML($message);
-		}
 		
-		return $message;
+		return StringUtil::truncateHTML($message, $maxLength);
 	}
 	
 	/**