From fb88a8cb4f015872e46f8ee4b36766d9d365b9e5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Fri, 27 Jan 2023 11:15:35 +0100
Subject: [PATCH] Perform large-scale removal of unneeded `@` symbols in
 templates

---
 language/de.xml                                |  4 ++--
 language/en.xml                                |  4 ++--
 templates/__searchAreaConversationSettings.tpl |  2 +-
 templates/__userPanelConversationDropdown.tpl  |  2 +-
 templates/conversation.tpl                     | 14 +++++++-------
 templates/conversationLabelAssignment.tpl      |  4 ++--
 templates/conversationLabelManagement.tpl      |  4 ++--
 templates/conversationList.tpl                 | 16 ++++++++--------
 templates/conversationMessageInlineEditor.tpl  |  2 +-
 templates/conversationMessageList.tpl          | 12 ++++++------
 templates/conversationQuickReply.tpl           |  6 +++---
 templates/moderationConversationMessage.tpl    |  4 ++--
 12 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/language/de.xml b/language/de.xml
index 6527476..0733164 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -175,8 +175,8 @@
 		<item name="wcf.conversation.log.conversation.open"><![CDATA[Hat die Konversation wieder geöffnet.]]></item>
 		<item name="wcf.conversation.log.conversation.close"><![CDATA[Hat die Konversation für neue Nachrichten geschlossen.]]></item>
 		<item name="wcf.conversation.log.conversation.leave"><![CDATA[Hat die Konversation verlassen.]]></item>
-		<item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Hat folgende Teilnehmer hinzugefügt: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}]]></item>
-		<item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Hat folgenden Teilnehmer entfernt: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{@$additionalData[userID]}">{$additionalData[username]}</a>]]></item>
+		<item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Hat folgende Teilnehmer hinzugefügt: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{$participant[userID]}">{$participant[username]}</a>{/implode}]]></item>
+		<item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Hat folgenden Teilnehmer entfernt: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{$additionalData[userID]}">{$additionalData[username]}</a>]]></item>
 	</category>
 	<category name="wcf.acp.dataImport">
 		<item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>
diff --git a/language/en.xml b/language/en.xml
index f8df4dd..5ea4a01 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -175,8 +175,8 @@
 		<item name="wcf.conversation.log.conversation.open"><![CDATA[Opened the conversation again.]]></item>
 		<item name="wcf.conversation.log.conversation.close"><![CDATA[Closed the conversation for new replies.]]></item>
 		<item name="wcf.conversation.log.conversation.leave"><![CDATA[Left the conversation.]]></item>
-		<item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Added the following participants: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}.]]></item>
-		<item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Removed a participant: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{@$additionalData[userID]}">{$additionalData[username]}</a>.]]></item>
+		<item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Added the following participants: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-object-id="{$participant[userID]}">{$participant[username]}</a>{/implode}.]]></item>
+		<item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Removed a participant: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-object-id="{$additionalData[userID]}">{$additionalData[username]}</a>.]]></item>
 	</category>
 	<category name="wcf.acp.dataImport">
 		<item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>
diff --git a/templates/__searchAreaConversationSettings.tpl b/templates/__searchAreaConversationSettings.tpl
index 33b1a15..bfbeafb 100644
--- a/templates/__searchAreaConversationSettings.tpl
+++ b/templates/__searchAreaConversationSettings.tpl
@@ -3,6 +3,6 @@
 	
 	{if $__wcf->getActivePage()->identifier == 'com.woltlab.wcf.conversation.Conversation'}
 		{capture assign='__searchTypeLabel'}{lang}wcf.search.type.com.woltlab.wcf.conversation{/lang}{/capture}
-		{capture assign='__searchTypesScoped'}<li><a href="#" data-extended-link="{link controller='Search'}extended=1&type=com.woltlab.wcf.conversation.message{/link}" data-object-type="com.woltlab.wcf.conversation.message" data-parameters='{ "conversationID": {@$conversation->conversationID} }'>{lang}wcf.search.type.com.woltlab.wcf.conversation{/lang}</a></li>{/capture}
+		{capture assign='__searchTypesScoped'}<li><a href="#" data-extended-link="{link controller='Search'}extended=1&type=com.woltlab.wcf.conversation.message{/link}" data-object-type="com.woltlab.wcf.conversation.message" data-parameters='{ "conversationID": {$conversation->conversationID} }'>{lang}wcf.search.type.com.woltlab.wcf.conversation{/lang}</a></li>{/capture}
 	{/if}
 {/if}
diff --git a/templates/__userPanelConversationDropdown.tpl b/templates/__userPanelConversationDropdown.tpl
index 36eae5f..4fdc3d7 100644
--- a/templates/__userPanelConversationDropdown.tpl
+++ b/templates/__userPanelConversationDropdown.tpl
@@ -16,7 +16,7 @@
 			{/if}
 		</a>
 		{if !OFFLINE || $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')}
-			<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
+			<script data-relocate="true" src="{$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
 			<script data-relocate="true">
 				require(["WoltLabSuite/Core/Conversation/Ui/User/Menu/Data/Conversation"], ({ setup }) => {
 					setup({
diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index c9adba3..2d4870c 100644
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -7,7 +7,7 @@
 		</div>
 		
 		<div class="contentHeaderTitle">
-			<h1 class="contentTitle jsConversationSubject" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</h1>
+			<h1 class="contentTitle jsConversationSubject" data-conversation-id="{$conversation->conversationID}">{$conversation->subject}</h1>
 			
 			<ul class="inlineList contentHeaderMetaData">
 				{hascontent}
@@ -69,7 +69,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-	<div class="conversation jsConversationInlineEditorContainer contentInteractionButton" data-conversation-id="{@$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{@$label->labelID}{/implode} ]" data-is-closed="{@$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}" data-is-draft="{if $conversation->isDraft}1{else}0{/if}">
+	<div class="conversation jsConversationInlineEditorContainer contentInteractionButton" data-conversation-id="{$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{$label->labelID}{/implode} ]" data-is-closed="{$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}" data-is-draft="{if $conversation->isDraft}1{else}0{/if}">
 		{if $conversation->isDraft}
 			<a href="{link controller='ConversationDraftEdit' id=$conversation->conversationID}{/link}" class="button small jsConversationInlineEditor">
 				{icon name='pencil'}
@@ -92,7 +92,7 @@
 		
 		<ul class="containerBoxList tripleColumned conversationParticipantList jsObjectActionContainer" data-object-action-class-name="wcf\data\conversation\ConversationAction">
 			{foreach from=$participants item=participant}
-				<li class="jsParticipant jsObjectActionObject{if !$participant->userID || $participant->hideConversation == 2 || $participant->leftAt > 0} conversationLeft{/if}" data-object-id="{@$conversation->getObjectID()}">
+				<li class="jsParticipant jsObjectActionObject{if !$participant->userID || $participant->hideConversation == 2 || $participant->leftAt > 0} conversationLeft{/if}" data-object-id="{$conversation->getObjectID()}">
 					<div class="box24">
 						{user object=$participant type='avatar24' ariaHidden='true' tabindex='-1'}
 						<div>
@@ -106,7 +106,7 @@
 										data-object-action="removeParticipant"
 										title="{lang}wcf.conversation.participants.removeParticipant{/lang}"
 										data-confirm-message="{lang __encode=true}wcf.conversation.participants.removeParticipant.confirmMessage{/lang}"
-										data-object-action-parameter-user-id="{@$participant->getObjectID()}"
+										data-object-action-parameter-user-id="{$participant->getObjectID()}"
 									>
 										{icon name='xmark'}
 									</button>
@@ -138,8 +138,8 @@
 	</ul>
 </div>
 
-{if !ENABLE_DEBUG_MODE}<script src="{@$__wcf->getPath()}js/WoltLabSuite.Core.Conversation.min.js?v={@LAST_UPDATE_TIME}"></script>{/if}
-<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
+{if !ENABLE_DEBUG_MODE}<script src="{$__wcf->getPath()}js/WoltLabSuite.Core.Conversation.min.js?v={@LAST_UPDATE_TIME}"></script>{/if}
+<script data-relocate="true" src="{$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
@@ -159,7 +159,7 @@
 			'wcf.conversation.label.assignLabels': '{jslang}wcf.conversation.label.assignLabels{/jslang}'
 		});
 		
-		var $availableLabels = [ {implode from=$labelList item=label}{ cssClassName: '{if $label->cssClassName}{@$label->cssClassName}{/if}', labelID: {@$label->labelID}, label: '{$label->label|encodeJS}' }{/implode} ];
+		var $availableLabels = [ {implode from=$labelList item=label}{ cssClassName: '{if $label->cssClassName}{@$label->cssClassName|encodeJS}{/if}', labelID: {@$label->labelID}, label: '{$label->label|encodeJS}' }{/implode} ];
 		var $editorHandler = new WCF.Conversation.EditorHandlerConversation($availableLabels);
 		var $inlineEditor = new WCF.Conversation.InlineEditor('.conversation');
 		$inlineEditor.setEditorHandler($editorHandler);
diff --git a/templates/conversationLabelAssignment.tpl b/templates/conversationLabelAssignment.tpl
index 180675e..e0d1d66 100644
--- a/templates/conversationLabelAssignment.tpl
+++ b/templates/conversationLabelAssignment.tpl
@@ -2,8 +2,8 @@
 	{foreach from=$labelList item=label}
 		<li>
 			<label>
-				<input type="checkbox"{if $label->labelID|in_array:$assignedLabels} checked{/if} data-label-id="{@$label->labelID}">
-				<span class="badge label{if $label->cssClassName} {@$label->cssClassName}{/if}">{$label->label}</span>
+				<input type="checkbox"{if $label->labelID|in_array:$assignedLabels} checked{/if} data-label-id="{$label->labelID}">
+				<span class="badge label{if $label->cssClassName} {$label->cssClassName}{/if}">{$label->label}</span>
 			</label>
 		</li>
 	{/foreach}
diff --git a/templates/conversationLabelManagement.tpl b/templates/conversationLabelManagement.tpl
index aa68f99..999658f 100644
--- a/templates/conversationLabelManagement.tpl
+++ b/templates/conversationLabelManagement.tpl
@@ -7,7 +7,7 @@
 		<ul class="conversationLabelList">
 			{content}
 				{foreach from=$labelList item=label}
-					<li><a class="badge label{if $label->cssClassName} {@$label->cssClassName}{/if}" data-label-id="{@$label->labelID}" data-css-class-name="{if $label->cssClassName}{@$label->cssClassName}{else}none{/if}">{$label->label}</a></li>
+					<li><a class="badge label{if $label->cssClassName} {$label->cssClassName}{/if}" data-label-id="{$label->labelID}" data-css-class-name="{if $label->cssClassName}{$label->cssClassName}{else}none{/if}">{$label->label}</a></li>
 				{/foreach}
 			{/content}
 		</ul>
@@ -28,7 +28,7 @@
 				{foreach from=$cssClassNames item=cssClassName}
 					<li><label>
 						<input type="radio" name="cssClassName" value="{$cssClassName}"{if $cssClassName == 'none'} checked{/if}>
-						<span class="badge label{if $cssClassName != 'none'} {@$cssClassName}{/if}">{lang}wcf.conversation.label.placeholder{/lang}</span>
+						<span class="badge label{if $cssClassName != 'none'} {$cssClassName}{/if}">{lang}wcf.conversation.label.placeholder{/lang}</span>
 					</label></li>
 				{/foreach}
 			</ul>
diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index a3a116e..c4b1aaf 100644
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -81,7 +81,7 @@
 					{if $labelID}
 						{foreach from=$labelList item=label}
 							{if $label->labelID == $labelID}
-								<span class="badge label{if $label->cssClassName} {@$label->cssClassName}{/if}">{$label->label}</span>
+								<span class="badge label{if $label->cssClassName} {$label->cssClassName}{/if}">{$label->label}</span>
 							{/if}
 						{/foreach}
 					{else}
@@ -92,7 +92,7 @@
 				<div class="dropdownMenu">
 					<ul class="scrollableDropdownMenu">
 						{foreach from=$labelList item=label}
-							<li><a href="{link controller='ConversationList'}{if $filter}filter={@$filter}&{/if}{if !$participants|empty}participants={implode from=$participants item=participant}{$participant|rawurlencode}{/implode}&{/if}sortField={$sortField}&sortOrder={$sortOrder}&pageNo={@$pageNo}&labelID={@$label->labelID}{/link}"><span class="badge label{if $label->cssClassName} {@$label->cssClassName}{/if}" data-css-class-name="{if $label->cssClassName}{@$label->cssClassName}{/if}" data-label-id="{@$label->labelID}">{$label->label}</span></a></li>
+							<li><a href="{link controller='ConversationList'}{if $filter}filter={@$filter}&{/if}{if !$participants|empty}participants={implode from=$participants item=participant}{$participant|rawurlencode}{/implode}&{/if}sortField={$sortField}&sortOrder={$sortOrder}&pageNo={@$pageNo}&labelID={@$label->labelID}{/link}"><span class="badge label{if $label->cssClassName} {@$label->cssClassName}{/if}" data-css-class-name="{if $label->cssClassName}{@$label->cssClassName}{/if}" data-label-id="{$label->labelID}">{$label->label}</span></a></li>
 						{/foreach}
 					</ul>
 					<ul>
@@ -117,7 +117,7 @@
 			{assign var='conversationCount' value=$__wcf->getConversationHandler()->getConversationCount()}
 			{assign var='maxConversationCount' value=$__wcf->session->getPermission('user.conversation.maxConversations')}
 			<p class="conversationUsageBar{if $conversationCount/$maxConversationCount >= 1.0} red{elseif $conversationCount/$maxConversationCount > 0.9} yellow{/if}">
-				<span style="width: {if $conversationCount/$maxConversationCount < 1.0}{@$conversationCount/$maxConversationCount*100|round:0}{else}100{/if}%">{#$conversationCount/$maxConversationCount*100}%</span>
+				<span style="width: {if $conversationCount/$maxConversationCount < 1.0}{$conversationCount/$maxConversationCount*100|round:0}{else}100{/if}%">{#$conversationCount/$maxConversationCount*100}%</span>
 			</p>
 			<p><small>{lang}wcf.conversation.quota.description{/lang}</small></p>
 		</div>
@@ -189,9 +189,9 @@
 			
 			{foreach from=$objects item=conversation}
 				<li class="tabularListRow">
-					<ol class="tabularListColumns messageGroup conversation jsClipboardObject{if $conversation->isNew()} new{/if}" data-conversation-id="{@$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{@$label->labelID}{/implode} ]" data-is-closed="{@$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}">
+					<ol class="tabularListColumns messageGroup conversation jsClipboardObject{if $conversation->isNew()} new{/if}" data-conversation-id="{$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{$label->labelID}{/implode} ]" data-is-closed="{$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}">
 						<li class="columnMark jsOnly">
-							<label><input type="checkbox" class="jsClipboardItem" data-object-id="{@$conversation->conversationID}"></label>
+							<label><input type="checkbox" class="jsClipboardItem" data-object-id="{$conversation->conversationID}"></label>
 						</li>
 						<li class="columnIcon columnAvatar">
 							{if $conversation->getUserProfile()->getAvatar()}
@@ -218,7 +218,7 @@
 							{/hascontent}
 								
 							<h3>
-								<a href="{if $conversation->isNew()}{link controller='Conversation' object=$conversation}action=firstNew{/link}{else}{$conversation->getLink()}{/if}" class="conversationLink messageGroupLink" data-object-id="{@$conversation->conversationID}">{$conversation->subject}</a>
+								<a href="{if $conversation->isNew()}{link controller='Conversation' object=$conversation}action=firstNew{/link}{else}{$conversation->getLink()}{/if}" class="conversationLink messageGroupLink" data-object-id="{$conversation->conversationID}">{$conversation->subject}</a>
 								{if $conversation->replies}
 									<span class="badge messageGroupCounterMobile">{@$conversation->replies|shortUnit}</span>
 								{/if}
@@ -258,7 +258,7 @@
 							{if $conversation->getParticipantSummary()|count}
 								<small class="conversationParticipantSummary">
 									{assign var='participantSummaryCount' value=$conversation->getParticipantSummary()|count}
-									{lang}wcf.conversation.participants{/lang}: {implode from=$conversation->getParticipantSummary() item=participant}<a href="{$participant->getLink()}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-object-id="{@$participant->userID}">{$participant->username}</a>{/implode}
+									{lang}wcf.conversation.participants{/lang}: {implode from=$conversation->getParticipantSummary() item=participant}<a href="{$participant->getLink()}" class="userLink{if $participant->hideConversation == 2} conversationLeft{/if}" data-object-id="{$participant->userID}">{$participant->username}</a>{/implode}
 									{if $participantSummaryCount < $conversation->participants}{lang}wcf.conversation.participants.other{/lang}{/if}
 								</small>
 							{/if}
@@ -333,7 +333,7 @@
 	{/hascontent}
 </footer>
 
-<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
+<script data-relocate="true" src="{$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
 <script data-relocate="true">
 	require([
 		'WoltLabSuite/Core/Language',
diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index cffb0e9..3d275e8 100644
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -1,7 +1,7 @@
 {capture assign='wysiwygSelector'}messageEditor{@$message->messageID}{/capture}
 <div class="messageInlineEditor">
 	<textarea id="{$wysiwygSelector}" class="wysiwygTextarea"
-	          data-autosave="com.woltlab.wcf.conversation.messageEdit-{@$message->messageID}"
+	          data-autosave="com.woltlab.wcf.conversation.messageEdit-{$message->messageID}"
 	          data-support-mention="true"
 	>{$message->message}</textarea>
 	{capture assign=wysiwygContainerID}messageEditor{@$message->messageID}{/capture}
diff --git a/templates/conversationMessageList.tpl b/templates/conversationMessageList.tpl
index 6f51a9f..de7fa9a 100644
--- a/templates/conversationMessageList.tpl
+++ b/templates/conversationMessageList.tpl
@@ -6,15 +6,15 @@
 	{assign var='objectID' value=$message->messageID}
 	{assign var='userProfile' value=$message->getUserProfile()}
 	
-	<li id="message{@$message->messageID}" class="anchorFixedHeader{if $conversation->userID == $message->userID} messageGroupStarter{/if}">
-		<article class="message messageSidebarOrientation{@$__wcf->getStyleHandler()->getStyle()->getVariable('messageSidebarOrientation')|ucfirst} jsMessage{if $userProfile->userOnlineGroupID} userOnlineGroupMarking{@$userProfile->userOnlineGroupID}{/if}" data-user-id="{@$message->userID}" data-can-edit="{if $message->canEdit()}1{else}0{/if}" data-object-id="{@$message->messageID}">
+	<li id="message{$message->messageID}" class="anchorFixedHeader{if $conversation->userID == $message->userID} messageGroupStarter{/if}">
+		<article class="message messageSidebarOrientation{$__wcf->getStyleHandler()->getStyle()->getVariable('messageSidebarOrientation')|ucfirst} jsMessage{if $userProfile->userOnlineGroupID} userOnlineGroupMarking{$userProfile->userOnlineGroupID}{/if}" data-user-id="{$message->userID}" data-can-edit="{if $message->canEdit()}1{else}0{/if}" data-object-id="{$message->messageID}">
 			{include file='messageSidebar'}
 			
 			<div class="messageContent">
 				<header class="messageHeader">
 					<div class="messageHeaderBox">
 						<ul class="messageHeaderMetaData">
-							<li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{@$message->messageID}" class="permalink messagePublicationTime">{@$message->time|time}</a></li>
+							<li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{$message->messageID}" class="permalink messagePublicationTime">{@$message->time|time}</a></li>
 							
 							{event name='messageHeaderMetaData'}
 						</ul>
@@ -29,7 +29,7 @@
 					</div>
 					
 					<ul class="messageQuickOptions">
-						<li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{@$message->messageID}" class="jsTooltip" title="{lang}wcf.conversation.message.permalink{/lang}">#{#$startIndex}</a></li>
+						<li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{$message->messageID}" class="jsTooltip" title="{lang}wcf.conversation.message.permalink{/lang}">#{#$startIndex}</a></li>
 						
 						{event name='messageQuickOptions'}
 					</ul>
@@ -82,7 +82,7 @@
 							{/if}
 							<li
 								class="jsQuoteMessage"
-								data-object-id="{@$message->messageID}"
+								data-object-id="{$message->messageID}"
 								data-is-quoted="{if $__quoteFullQuote|isset && $message->messageID|in_array:$__quoteFullQuote}1{else}0{/if}"
 							>
 								<a
@@ -96,7 +96,7 @@
 								</a>
 							</li>
 							{if $message->userID != $__wcf->getUser()->userID && $__wcf->session->getPermission('user.profile.canReportContent')}
-								<li class="jsReportConversationMessage jsOnly" data-object-id="{@$message->messageID}">
+								<li class="jsReportConversationMessage jsOnly" data-object-id="{$message->messageID}">
 									<button type="button" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">
 										{icon name='triangle-exclamation'}
 										<span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span>
diff --git a/templates/conversationQuickReply.tpl b/templates/conversationQuickReply.tpl
index f3d04c7..b66377f 100644
--- a/templates/conversationQuickReply.tpl
+++ b/templates/conversationQuickReply.tpl
@@ -1,5 +1,5 @@
-<li id="messageQuickReply" class="jsOnly{if $conversation->userID == $__wcf->getUser()->userID} messageGroupStarter{/if}{if $pageNo < $pages} messageQuickReplyCollapsed{/if}" data-object-id="{@$conversation->conversationID}" data-last-post-time="{@$conversation->lastPostTime}" data-page-no="{@$pageNo}">
-	<article class="message messageSidebarOrientation{@$__wcf->getStyleHandler()->getStyle()->getVariable('messageSidebarOrientation')|ucfirst}{if $__wcf->getUserProfileHandler()->userOnlineGroupID} userOnlineGroupMarking{@$__wcf->getUserProfileHandler()->userOnlineGroupID}{/if}">
+<li id="messageQuickReply" class="jsOnly{if $conversation->userID == $__wcf->getUser()->userID} messageGroupStarter{/if}{if $pageNo < $pages} messageQuickReplyCollapsed{/if}" data-object-id="{$conversation->conversationID}" data-last-post-time="{$conversation->lastPostTime}" data-page-no="{$pageNo}">
+	<article class="message messageSidebarOrientation{$__wcf->getStyleHandler()->getStyle()->getVariable('messageSidebarOrientation')|ucfirst}{if $__wcf->getUserProfileHandler()->userOnlineGroupID} userOnlineGroupMarking{$__wcf->getUserProfileHandler()->userOnlineGroupID}{/if}">
 		{include file='messageSidebar' userProfile=$__wcf->getUserProfileHandler()->getUserProfile() isReply=true enableMicrodata=false}
 		
 		<div class="messageContent messageQuickReplyContent"{if $pageNo < $pages} data-placeholder="{lang}wcf.conversation.reply{/lang}"{/if}>
@@ -11,7 +11,7 @@
 				{event name='beforeWysiwyg'}
 				
 				<textarea id="text" name="text" class="wysiwygTextarea"
-				          data-autosave="com.woltlab.wcf.conversation.messageAdd-{@$conversation->conversationID}"
+				          data-autosave="com.woltlab.wcf.conversation.messageAdd-{$conversation->conversationID}"
 				          data-support-mention="true"
 				></textarea>
 				{include file='messageFormTabsInline' inConversationQuickReply=true}
diff --git a/templates/moderationConversationMessage.tpl b/templates/moderationConversationMessage.tpl
index eb91b2d..be4f85c 100644
--- a/templates/moderationConversationMessage.tpl
+++ b/templates/moderationConversationMessage.tpl
@@ -5,7 +5,7 @@
 				{user object=$message->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
 				
 				<div class="messageHeaderBox">
-					<h2 class="messageTitle">{if $message->getConversation()->canRead()}<a href="{@$message->getLink()}">{$message->getTitle()}</a>{else}{$message->getTitle()}{/if}</h2>
+					<h2 class="messageTitle">{if $message->getConversation()->canRead()}<a href="{$message->getLink()}">{$message->getTitle()}</a>{else}{$message->getTitle()}{/if}</h2>
 					
 					<ul class="messageHeaderMetaData">
 						<li>{user object=$message->getUserProfile() class='username'}</li>
@@ -29,4 +29,4 @@
 			{event name='afterMessageText'}
 		</div>
 	</div>
-</article>
\ No newline at end of file
+</article>
-- 
2.20.1