Allow newlines/paragraphs for article teasers

Closes #2225

diff --git a/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php b/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php
index d25ec43b58f3c11ab408e7fa6276ee90271ab8a9..9a0dfc68d7944a11560a4288595862d75bcea295 100644 (file)
--- a/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php
+++ b/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php
@@ -76,12 +76,12 @@ class ArticleContent extends DatabaseObject implements ILinkableObject, IRouteCo
         */
        public function getFormattedTeaser() {
                if ($this->teaser) {
-                       return StringUtil::encodeHTML($this->teaser);
+                       return nl2br(StringUtil::encodeHTML($this->teaser), false);
                }
                else {
                        $htmlInputProcessor = new HtmlInputProcessor();
                        $htmlInputProcessor->processIntermediate($this->content);
-                       return StringUtil::encodeHTML(StringUtil::truncate($htmlInputProcessor->getTextContent(), 500));
+                       return nl2br(StringUtil::encodeHTML(StringUtil::truncate($htmlInputProcessor->getTextContent(), 500)), false);
                }
        }