Add category description

See #2657

diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 4a547f2218ac385cdee6d3c477bc64cb7cfdf3e8..c53cb508ebff867d30048602166adf6d5f7e70c7 100644 (file)
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -1,6 +1,7 @@
 {capture assign='pageTitle'}{$category->getTitle()}{/capture}
 
 {capture assign='contentTitle'}{$category->getTitle()}{/capture}
+{capture assign='contentDescription'}{$category->getDescription()}{/capture}
 
 {capture assign='headContent'}
        {if $pageNo < $pages}

diff --git a/wcfsetup/install/files/lib/system/category/ArticleCategoryType.class.php b/wcfsetup/install/files/lib/system/category/ArticleCategoryType.class.php
index 908b92a26292403532a869f3e1abd54625d853db..0eeca2f03ee3cd8e32f3d4e53cd8b751cd88707d 100644 (file)
--- a/wcfsetup/install/files/lib/system/category/ArticleCategoryType.class.php
+++ b/wcfsetup/install/files/lib/system/category/ArticleCategoryType.class.php
@@ -20,7 +20,7 @@ class ArticleCategoryType extends AbstractCategoryType {
        /**
         * @inheritDoc
         */
-       protected $hasDescription = false;
+       protected $forceDescription = false;
        
        /**
         * @inheritDoc