From 8be0ca1e76c54d0bae4d2b97bbf38465cd948c40 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Joshua=20R=C3=BCsweg?= <josh@bastelstu.be>
Date: Fri, 4 Aug 2017 16:11:27 +0200
Subject: [PATCH] Disable newlines in trophy description

See #2315
---
 com.woltlab.wcf/templates/groupedUserTrophyList.tpl          | 2 +-
 com.woltlab.wcf/templates/trophy.tpl                         | 4 ++--
 com.woltlab.wcf/templates/trophyList.tpl                     | 2 +-
 wcfsetup/install/files/acp/templates/trophyAdd.tpl           | 4 ++--
 wcfsetup/install/files/acp/templates/userTrophyAdd.tpl       | 5 ++---
 wcfsetup/install/files/lib/data/trophy/Trophy.class.php      | 2 +-
 .../install/files/lib/data/user/trophy/UserTrophy.class.php  | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/templates/groupedUserTrophyList.tpl b/com.woltlab.wcf/templates/groupedUserTrophyList.tpl
index 944c01eab6..48cb1fe668 100644
--- a/com.woltlab.wcf/templates/groupedUserTrophyList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserTrophyList.tpl
@@ -7,7 +7,7 @@
 
 					<div class="containerHeadline">
 						<h3><a href="{link controller='Trophy' object=$userTrophy->getTrophy()}{/link}">{@$userTrophy->getTrophy()->getTitle()}</a></h3>
-						<small>{@$userTrophy->getDescription()} - {@$userTrophy->time|time}</small>
+						<small>{$userTrophy->getDescription()} - {@$userTrophy->time|time}</small>
 					</div>
 				</div>
 			</li>
diff --git a/com.woltlab.wcf/templates/trophy.tpl b/com.woltlab.wcf/templates/trophy.tpl
index a22edac151..f238c92bf7 100644
--- a/com.woltlab.wcf/templates/trophy.tpl
+++ b/com.woltlab.wcf/templates/trophy.tpl
@@ -18,7 +18,7 @@
 		<div class="contentHeaderTitle">
 			<h1 class="contentTitle">{$trophy->getTitle()}</h1>
 			<ul class="inlineList contentHeaderMetaData">
-				<li>{@$trophy->getDescription()}</li>
+				<li>{$trophy->getDescription()}</li>
 				<li><span class="icon icon16 fa-users"></span> {@$items}</li>
 			</ul>
 		</div>
@@ -43,7 +43,7 @@
 
 				<div class="sidebarItemTitle">
 					<h3>{@$userTrophy->getUserProfile()->getAnchorTag()}</h3>
-					<small>{@$userTrophy->getDescription()} – {@$userTrophy->time|time}</small>
+					<small>{$userTrophy->getDescription()} – {@$userTrophy->time|time}</small>
 				</div>
 			</li>
 		{/foreach}
diff --git a/com.woltlab.wcf/templates/trophyList.tpl b/com.woltlab.wcf/templates/trophyList.tpl
index f97ab713ec..a023888bc6 100644
--- a/com.woltlab.wcf/templates/trophyList.tpl
+++ b/com.woltlab.wcf/templates/trophyList.tpl
@@ -52,7 +52,7 @@
 
 						<div class="sidebarItemTitle">
 							<h3><a href="{$trophy->getLink()}">{@$trophy->getTitle()}</a></h3>
-							<small>{@$trophy->getDescription()}</small>
+							<small>{$trophy->getDescription()}</small>
 						</div>
 					</li>
 				{/foreach}
diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index f598edabf8..2e031e2977 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -80,11 +80,11 @@
 				</dd>
 			</dl>
 			{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
-			
+
 			<dl{if $errorField == 'description'} class="formError"{/if}>
 				<dt><label for="description">{lang}wcf.acp.trophy.description{/lang}</label></dt>
 				<dd>
-					<textarea id="description" name="description" cols="40" rows="10">{$i18nPlainValues[description]}</textarea>
+					<input id="description" name="description" type="text" value="{$i18nPlainValues[description]}">
 					{if $errorField == 'description'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
index ea5762ee5b..3d885bfca5 100644
--- a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
@@ -98,12 +98,11 @@
 				<label><input type="checkbox" name="useCustomDescription" value="1"{if $useCustomDescription} checked{/if}> {lang}wcf.acp.trophy.userTrophy.useCustomDescription{/lang}</label>
 			</dd>
 		</dl>
-
-
+		
 		<dl id="userTrophyDescriptionDL"{if $errorField == 'description'} class="formError"{/if}{if !$useCustomDescription} style="display: none;"{/if}>
 			<dt><label for="description">{lang}wcf.acp.trophy.description{/lang}</label></dt>
 			<dd>
-				<textarea id="description" name="description" cols="40" rows="10">{$i18nPlainValues[description]}</textarea>
+				<input id="description" name="description" type="text" value="{$i18nPlainValues[description]}">
 				{if $errorField == 'description'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
index ac86bbf9da..5405f53f78 100644
--- a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
+++ b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
@@ -144,7 +144,7 @@ class Trophy extends DatabaseObject implements ITitledLinkObject, IRouteControll
 	 * @return 	string
 	 */
 	public function getDescription() {
-		return nl2br(StringUtil::encodeHTML(WCF::getLanguage()->get($this->description)), false); 
+		return WCF::getLanguage()->get($this->description);
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php b/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
index 65f2669f80..d496cdad17 100644
--- a/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
@@ -67,7 +67,7 @@ class UserTrophy extends DatabaseObject {
 			return $this->getTrophy()->getDescription();
 		}
 		
-		return nl2br(StringUtil::encodeHTML(strtr($this->description, $this->getReplacements())));
+		return strtr(WCF::getLanguage()->get($this->description), $this->getReplacements());
 	}
 	
 	/**
-- 
2.20.1