Merge pull request #6351 from WoltLab/6.2-article-templates-unsafe

Refactor article templates

Author: Cyperghost

com.woltlab.wcf/templates/articleAdd.tpl

@@ -69,4 +69,4 @@
 			</li>
 		{/foreach}
 	</ul>
-{if}
+{/if}

com.woltlab.wcf/templates/boxArticleList.tpl

@@ -21,7 +21,7 @@
 {capture assign='contentHeaderNavigation'}
 	{if $canManageArticles}
 		{if $availableLanguages|count > 1}
-			<li><button type="button" class="button buttonPrimary jsButtonArticleAdd">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+			<li><button type="button" class="button buttonPrimary jsButtonArticleAdd">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></button></li>
 		{else}
 			<li><a href="{link controller='ArticleAdd'}categoryID={$category->categoryID}{/link}" class="button buttonPrimary">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
 		{/if}

com.woltlab.wcf/templates/categoryArticleList.tpl

@@ -6,12 +6,12 @@
 
 				<div class="messageHeaderBox">
 					<h2 class="messageTitle">
-						<a href="{@$article->getLink()}">{$article->getTitle()}</a>
+						<a href="{$article->getLink()}">{$article->getTitle()}</a>
 					</h2>
 
 					<ul class="messageHeaderMetaData">
 						<li>{user object=$article->getUserProfile() class='username'}</li>
-						<li><span class="messagePublicationTime">{@$article->time|time}</span></li>
+						<li><span class="messagePublicationTime">{time time=$article->time}</span></li>
 
 						{event name='messageHeaderMetaData'}
 					</ul>
@@ -25,7 +25,7 @@
 			{event name='beforeMessageText'}
 
 			<div class="messageText">
-				{@$article->getFormattedContent()}
+				{unsafe:$article->getFormattedContent()}
 			</div>
 
 			{event name='afterMessageText'}

com.woltlab.wcf/templates/moderationArticle.tpl

@@ -4,7 +4,7 @@
 		<select name="articleCategoryID" id="articleCategoryID">
 			<option value="">{lang}wcf.global.noSelection{/lang}</option>
 			{foreach from=$articleCategoryList item=category}
-				<option value="{$category->categoryID}">{if $category->getDepth() > 1}{@'&nbsp;&nbsp;&nbsp;&nbsp;'|str_repeat:-1+$category->getDepth()}{/if}{$category->getTitle()}</option>
+				<option value="{$category->categoryID}">{if $category->getDepth() > 1}{unsafe:'&nbsp;&nbsp;&nbsp;&nbsp;'|str_repeat:-1+$category->getDepth()}{/if}{$category->getTitle()}</option>
 			{/foreach}
 		</select>
 	</dd>

com.woltlab.wcf/templates/searchArticle.tpl

@@ -21,7 +21,7 @@
 			'wcf.acp.article.add': '{jslang}wcf.acp.article.add{/jslang}'
 		});
 		
-		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{if $categoryID}&categoryID={@$categoryID}{/if}{/link}');
+		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{if $categoryID}&categoryID={$categoryID}{/if}{/link}');
 		
 		{if $showArticleAddDialog}
 			window.setTimeout(function() {

com.woltlab.wcf/templates/shared_articleAddDialog.tpl

@@ -6,7 +6,7 @@
 				<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 
 				{foreach from=$categoryNodeList item=category}
-					<option value="{$category->categoryID}">{if $category->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
+					<option value="{$category->categoryID}">{if $category->getDepth() > 1}{unsafe:"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
 				{/foreach}
 			</select>
 		</dd>

wcfsetup/install/files/acp/templates/articleAdd.tpl

@@ -94,6 +94,7 @@ protected function getTemplate()
         return WCF::getTPL()->render('wcf', 'boxArticleList', [
             'boxArticleList' => $this->objectList,
             'boxSortField' => $this->sortField,
+            'boxPosition' => $this->box->position,
         ]);
     }
 }