From: Joshua Rüsweg <josh@bastelstu.be>
Date: Wed, 16 Aug 2017 15:40:36 +0000 (+0200)
Subject: Make trophy category description optional
X-Git-Tag: 3.1.0_Alpha_1~18
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aed0411e8862eb6ba6efe13ccc09505cf45328cd;p=GitHub%2FWoltLab%2FWCF.git

Make trophy category description optional
---

diff --git a/com.woltlab.wcf/templates/trophyList.tpl b/com.woltlab.wcf/templates/trophyList.tpl
index 3c1b122861..ef3fb4b57f 100644
--- a/com.woltlab.wcf/templates/trophyList.tpl
+++ b/com.woltlab.wcf/templates/trophyList.tpl
@@ -4,11 +4,9 @@
 	<header class="contentHeader messageGroupContentHeader">
 		<div class="contentHeaderTitle">
 			<h1 class="contentTitle">{$category->getTitle()}</h1>
-			<ul class="inlineList contentHeaderMetaData">
-				<li>
-					{$category->getDescription()}
-				</li>
-			</ul>
+			{if $category->getDescription()}
+				<p class="contentHeaderDescription">{$category->getDescription()}</p>
+			{/if}
 		</div>
 	</header>
 {/capture}
diff --git a/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php b/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
index 0258ba796c..e0ec86fac9 100644
--- a/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
+++ b/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
@@ -25,6 +25,11 @@ class TrophyCategoryType extends AbstractCategoryType {
 	 */
 	protected $maximumNestingLevel = 0;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $forceDescription = false;
+	
 	/** @noinspection PhpMissingParentCallCommonInspection */
 	/**
 	 * @inheritDoc