Reflecting API changes

diff --git a/files/lib/data/conversation/message/ConversationMessage.class.php b/files/lib/data/conversation/message/ConversationMessage.class.php
index 21caf4d75b043b507f6cd1c36824e4b909e1621a..1474fd4fa3cdf7dea7d930c9a014703b76052146 100644 (file)
--- 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);
        }
        
        /**