From 72c85f64e77a014ebb4a0358424578ce62f5f893 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 6 Jun 2020 10:29:14 +0200
Subject: [PATCH] Use UserTemplatePlugin and getLink()

See #3295
See #3322
---
 .../templates/__videoAttachmentBBCode.tpl            |  4 ++--
 .../templates/__wysiwygAttachmentFormField.tpl       |  8 ++++----
 com.woltlab.wcf/templates/attachments.tpl            | 10 +++++-----
 com.woltlab.wcf/templates/authorSidebarBox.tpl       | 10 ++++++++--
 com.woltlab.wcf/templates/boxFollowingsOnline.tpl    |  2 +-
 .../templates/boxRecentActivitySidebar.tpl           |  2 +-
 com.woltlab.wcf/templates/boxSignedInAs.tpl          |  2 +-
 com.woltlab.wcf/templates/boxStaffOnline.tpl         |  2 +-
 com.woltlab.wcf/templates/boxTodaysBirthdays.tpl     |  2 +-
 .../templates/boxTodaysFollowingBirthdays.tpl        |  2 +-
 com.woltlab.wcf/templates/boxUserList.tpl            |  2 +-
 com.woltlab.wcf/templates/commentList.tpl            |  4 +---
 com.woltlab.wcf/templates/commentResponseList.tpl    |  4 +---
 com.woltlab.wcf/templates/following.tpl              |  4 ++--
 com.woltlab.wcf/templates/ignoredUsers.tpl           |  4 ++--
 com.woltlab.wcf/templates/messageFormAttachments.tpl |  8 ++++----
 com.woltlab.wcf/templates/messageQuoteList.tpl       | 12 +++++++++---
 com.woltlab.wcf/templates/messageSidebar.tpl         |  4 ++--
 com.woltlab.wcf/templates/moderationArticle.tpl      |  4 ++--
 com.woltlab.wcf/templates/moderationComment.tpl      |  4 ++--
 com.woltlab.wcf/templates/moderationQueueList.tpl    |  4 ++--
 com.woltlab.wcf/templates/moderationReport.tpl       |  4 +---
 com.woltlab.wcf/templates/notificationList.tpl       |  2 +-
 com.woltlab.wcf/templates/pageHeaderUser.tpl         |  8 ++++----
 com.woltlab.wcf/templates/pageMenuMobile.tpl         |  2 +-
 com.woltlab.wcf/templates/recentActivityListItem.tpl |  2 +-
 com.woltlab.wcf/templates/searchResultList.tpl       |  2 +-
 com.woltlab.wcf/templates/userBirthdayList.tpl       |  4 ++--
 .../templates/userInformationStatistics.tpl          |  2 +-
 com.woltlab.wcf/templates/userListItem.tpl           |  4 ++--
 com.woltlab.wcf/templates/userProfileLikeItem.tpl    |  2 +-
 com.woltlab.wcf/templates/userProfilePreview.tpl     |  4 ++--
 com.woltlab.wcf/templates/userSidebar.tpl            |  6 +++---
 com.woltlab.wcf/templates/usersOnlineList.tpl        |  4 ++--
 .../acp/templates/__wysiwygAttachmentFormField.tpl   |  8 ++++----
 .../install/files/acp/templates/attachmentList.tpl   |  6 +++---
 .../install/files/acp/templates/pageHeaderUser.tpl   |  2 +-
 .../files/lib/data/user/UserProfileAction.class.php  |  9 +++------
 38 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl b/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
index da69480dbb..9d1f824d75 100644
--- a/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
+++ b/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
@@ -1,8 +1,8 @@
 <div id="attachmentVideo_{@$attachmentIdentifier}" class="videoContainer" style="display: none;">
-	<video src="{link controller='Attachment' object=$attachment}{/link}" controls></video>
+	<video src="{$attachment->getLink()}" controls></video>
 </div>
 
-<a id="attachmentVideoLink_{@$attachmentIdentifier}" href="{link controller='Attachment' object=$attachment}{/link}">{$attachment->filename}</a>
+<a id="attachmentVideoLink_{@$attachmentIdentifier}" href="{$attachment->getLink()}">{$attachment->filename}</a>
 
 <script data-relocate="true">
 	{* try to determine if browser might be able to play video *}
diff --git a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index 03a1f583e2..003e63e82e 100644
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -11,14 +11,14 @@
 			*}data-is-image="{@$attachment->isImage}"{*
 		*}>
 			{if $attachment->tinyThumbnailType}
-				<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail">
+				<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 			{else}
 				<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
 			{/if}
 			
 			<div>
 				<div>
-					<p><a href="{link controller='Attachment' object=$attachment}{/link}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
+					<p><a href="{$attachment->getLink()}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
 					<small>{@$attachment->filesize|filesize}</small>
 				</div>
 				
@@ -26,9 +26,9 @@
 					<li><span class="button small jsDeleteButton" data-object-id="{@$attachment->attachmentID}" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</span></li>
 					{if $attachment->isImage}
 						{if $attachment->thumbnailType}
-							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}thumbnail=1{/link}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
+							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getThumbnailLink('thumbnail')}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
 						{/if}
-						<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}{/link}">{lang}wcf.attachment.insertFull{/lang}</span></li>
+						<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getLink()}">{lang}wcf.attachment.insertFull{/lang}</span></li>
 					{else}
 						<li><span class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</span></li>
 					{/if}
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
index 01b0d47a21..5f698562ad 100644
--- a/com.woltlab.wcf/templates/attachments.tpl
+++ b/com.woltlab.wcf/templates/attachments.tpl
@@ -9,15 +9,15 @@
 						{if $attachment->showAsImage() && !$attachment->isEmbedded()}
 							<li class="attachmentThumbnail" data-attachment-id="{@$attachment->attachmentID}">
 								{if $attachment->hasThumbnail()}
-									<a href="{link controller='Attachment' object=$attachment}{/link}"{if $attachment->canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}>
+									<a href="{$attachment->getLink()}"{if $attachment->canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}>
 								{/if}
 								
 								<div class="attachmentThumbnailContainer">
 									<span class="attachmentThumbnailImage">
 										{if $attachment->hasThumbnail()}
-											<img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" {if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
+											<img src="{$attachment->getThumbnailLink('thumbnail')}" alt="" {if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
 										{else}
-											<img src="{link controller='Attachment' object=$attachment}{/link}" alt="" {if $attachment->width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
+											<img src="{$attachment->getLink()}" alt="" {if $attachment->width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
 										{/if}
 									</span>
 								
@@ -61,10 +61,10 @@
 					{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
 						{if $attachment->showAsFile() && !$attachment->isEmbedded()}
 							<li class="box32" data-attachment-id="{@$attachment->attachmentID}">
-								<a href="{link controller='Attachment' object=$attachment}{/link}"><span class="icon icon32 fa-{@$attachment->getIconName()}"></span></a>
+								<a href="{$attachment->getLink()}"><span class="icon icon32 fa-{@$attachment->getIconName()}"></span></a>
 								
 								<div>
-									<p><a href="{link controller='Attachment' object=$attachment}{/link}">{$attachment->filename}</a></p>
+									<p><a href="{$attachment->getLink()}">{$attachment->filename}</a></p>
 									<small>{lang}wcf.attachment.file.info{/lang}</small>
 								</div>
 							</li>
diff --git a/com.woltlab.wcf/templates/authorSidebarBox.tpl b/com.woltlab.wcf/templates/authorSidebarBox.tpl
index b2ce6b48bd..b7b18321e0 100644
--- a/com.woltlab.wcf/templates/authorSidebarBox.tpl
+++ b/com.woltlab.wcf/templates/authorSidebarBox.tpl
@@ -4,7 +4,13 @@
 		
 		<div>
 			<div class="containerHeadline">
-				<h3>{if $userProfile->userID}<a href="{link controller='User' object=$userProfile}{/link}">{$userProfile->username}</a>{else}{$userProfile->username}{/if}</h3>
+				<h3>
+					{if $userProfile->userID}
+						{user object=$userProfile}
+					{else}
+						{$userProfile->username}
+					{/if}
+				</h3>
 				{if MODULE_USER_RANK}
 					{if $userProfile->getUserTitle()}
 						<p><span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {@$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span></p>
@@ -22,4 +28,4 @@
 			{/if}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
index e85904a373..f92609a2cf 100644
--- a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
+++ b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$usersOnlineList item=userOnline}
 		<li class="box32">
-			<a href="{link controller='User' object=$userOnline}{/link}" aria-hidden="true">{@$userOnline->getAvatar()->getImageTag(32)}</a>
+			{user object=$userOnline type='avatar32' ariaHidden='true'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$userOnline}</h3>
diff --git a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
index c7646b676a..e9ba482580 100644
--- a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$eventList item=event}
 		<li class="box24{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID)} ignoredUserContent{/if}">
-			<a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}">{@$event->getUserProfile()->getAvatar()->getImageTag(24)}</a>
+			{user object=$event->getUserProfile() type='avatar24'}
 			
 			<div class="sidebarItemTitle">
 				<h3>
diff --git a/com.woltlab.wcf/templates/boxSignedInAs.tpl b/com.woltlab.wcf/templates/boxSignedInAs.tpl
index cf7bfb3b00..bcc9659ab3 100644
--- a/com.woltlab.wcf/templates/boxSignedInAs.tpl
+++ b/com.woltlab.wcf/templates/boxSignedInAs.tpl
@@ -5,7 +5,7 @@
 		<div class="containerHeadline">
 			<h3>
 				{event name='beforeUsername'}
-				<a href="{link controller='User' object=$__wcf->user}{/link}">{$__wcf->user->username}</a>
+				{user object=$__wcf->getUserProfileHandler()->getUserProfile()}
 			</h3>
 			{if MODULE_USER_RANK}
 				{if $__wcf->getUserProfileHandler()->getUserTitle()}
diff --git a/com.woltlab.wcf/templates/boxStaffOnline.tpl b/com.woltlab.wcf/templates/boxStaffOnline.tpl
index 3a91b56c0a..99d6cf9ac6 100644
--- a/com.woltlab.wcf/templates/boxStaffOnline.tpl
+++ b/com.woltlab.wcf/templates/boxStaffOnline.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$usersOnlineList item=userOnline}
 		<li class="box32">
-			<a href="{link controller='User' object=$userOnline}{/link}" aria-hidden="true">{@$userOnline->getAvatar()->getImageTag(32)}</a>
+			{user object=$userOnline type='avatar32' ariaHidden='true'}
 			
 			<div class="sidebarItemTitle">
 				<h3>
diff --git a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
index 77b5c83c5c..2e9b2a4cc4 100644
--- a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
 		<li class="box32">
-			<a href="{link controller='User' object=$birthdayUserProfile}{/link}" aria-hidden="true">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
+			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$birthdayUserProfile}</h3>
diff --git a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
index d47a0a686c..5e5be36819 100644
--- a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
 		<li class="box32">
-			<a href="{link controller='User' object=$birthdayUserProfile}{/link}" aria-hidden="true">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
+			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$birthdayUserProfile}</h3>
diff --git a/com.woltlab.wcf/templates/boxUserList.tpl b/com.woltlab.wcf/templates/boxUserList.tpl
index 7933ede988..68b66c197f 100644
--- a/com.woltlab.wcf/templates/boxUserList.tpl
+++ b/com.woltlab.wcf/templates/boxUserList.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$boxUsers item=boxUser}
 		<li class="box24">
-			<a href="{link controller='User' object=$boxUser}{/link}" aria-hidden="true">{@$boxUser->getAvatar()->getImageTag(24)}</a>
+			{user object=$boxUser type='avatar24' ariaHidden='true'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$boxUser}</h3>
diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl
index f38c2f1173..5dd0725b02 100644
--- a/com.woltlab.wcf/templates/commentList.tpl
+++ b/com.woltlab.wcf/templates/commentList.tpl
@@ -14,9 +14,7 @@
 		>
 			<div class="box48{if $__wcf->getUserProfileHandler()->isIgnoredUser($comment->userID)} ignoredUserContent{/if}">
 				{if $comment->userID}
-					<a href="{link controller='User' object=$comment->getUserProfile()}{/link}" title="{$comment->getUserProfile()->username}">
-						{@$comment->getUserProfile()->getAvatar()->getImageTag(48)}
-					</a>
+					{user object=$comment->getUserProfile() type='avatar48' title=$comment->getUserProfile()->username}
 				{else}
 					{@$comment->getUserProfile()->getAvatar()->getImageTag(48)}
 				{/if}
diff --git a/com.woltlab.wcf/templates/commentResponseList.tpl b/com.woltlab.wcf/templates/commentResponseList.tpl
index 7d57392073..30643fa672 100644
--- a/com.woltlab.wcf/templates/commentResponseList.tpl
+++ b/com.woltlab.wcf/templates/commentResponseList.tpl
@@ -7,9 +7,7 @@
 		<li class="commentResponse jsCommentResponse" data-response-id="{@$response->responseID}" {@$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.comment.response', $response->responseID)} data-can-edit="{if $response->isEditable()}true{else}false{/if}" data-can-delete="{if $response->isDeletable()}true{else}false{/if}" data-user-id="{@$response->userID}">
 			<div class="box32{if $__wcf->getUserProfileHandler()->isIgnoredUser($response->userID)} ignoredUserContent{/if}">
 				{if $response->userID}
-					<a href="{link controller='User' object=$response->getUserProfile()}{/link}" title="{$response->getUserProfile()->username}">
-						{@$response->getUserProfile()->getAvatar()->getImageTag(32)}
-					</a>
+					{user object=$response->getUserProfile() type='avatar48' title=$response->getUserProfile()->username}
 				{else}
 					{@$response->getUserProfile()->getAvatar()->getImageTag(32)}
 				{/if}
diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl
index bd85e2c00e..9693ce6b1b 100644
--- a/com.woltlab.wcf/templates/following.tpl
+++ b/com.woltlab.wcf/templates/following.tpl
@@ -16,8 +16,8 @@
 			{foreach from=$objects item=user}
 				<li class="jsFollowing">
 					<div class="box48">
-						<a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
-							
+						{user object=$user type='avatar48' title=$user->username}
+						
 						<div class="details userInformation">
 							{include file='userInformationHeadline'}
 							
diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl
index d18f90b774..9987b329a4 100644
--- a/com.woltlab.wcf/templates/ignoredUsers.tpl
+++ b/com.woltlab.wcf/templates/ignoredUsers.tpl
@@ -16,8 +16,8 @@
 			{foreach from=$objects item=user}
 				<li class="jsIgnoredUser">
 					<div class="box48">
-						<a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
-							
+						{user object=$user type='avatar48' title=$user->username}
+						
 						<div class="details userInformation">
 							{include file='userInformationHeadline'}
 							
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index 38a3c7cdd0..43a361226e 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -3,22 +3,22 @@
 		{foreach from=$attachmentHandler->getAttachmentList() item=$attachment}
 			<li class="box64" data-object-id="{@$attachment->attachmentID}" data-height="{@$attachment->height}" data-width="{@$attachment->width}" data-is-image="{@$attachment->isImage}">
 				{if $attachment->tinyThumbnailType}
-					<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail">
+					<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 				{else}
 					<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
 				{/if}
 				
 				<div>
 					<div>
-						<p><a href="{link controller='Attachment' object=$attachment}{/link}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
+						<p><a href="{$attachment->getLink()}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
 						<small>{@$attachment->filesize|filesize}</small>
 					</div>
 					
 					<ul class="buttonGroup">
 						<li><span class="button small jsDeleteButton" data-object-id="{@$attachment->attachmentID}" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</span></li>
 						{if $attachment->isImage}
-							{if $attachment->thumbnailType}<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}thumbnail=1{/link}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>{/if}
-							<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}{/link}">{lang}wcf.attachment.insertFull{/lang}</span></li>
+							{if $attachment->thumbnailType}<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getThumbnailLink('thumbnail')}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>{/if}
+							<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getLink()}">{lang}wcf.attachment.insertFull{/lang}</span></li>
 						{else}
 							<li><span class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</span></li>
 						{/if}
diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl
index aca61802a9..4ca4c8c1b1 100644
--- a/com.woltlab.wcf/templates/messageQuoteList.tpl
+++ b/com.woltlab.wcf/templates/messageQuoteList.tpl
@@ -5,7 +5,7 @@
 			<header class="messageHeader">
 				<div class="box32 messageHeaderWrapper">
 					{if $userProfiles[$message->getUserID()]|isset}
-						<a href="{link controller='User' object=$userProfiles[$message->getUserID()]}{/link}" aria-hidden="true">{@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)}</a>
+						{user object=$userProfiles[$message->getUserID()] type='avatar32' ariaHidden='true'}
 					{else}
 						<span><img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 32px; height: 32px"></span>
 					{/if}
@@ -16,7 +16,13 @@
 						</h2>
 						
 						<ul class="messageHeaderMetaData">
-							<li>{if $userProfiles[$message->getUserID()]|isset}<a href="{link controller='User' object=$userProfiles[$message->getUserID()]}{/link}">{$message->getUsername()}</a>{else}<span class="username">{$message->getUsername()}</span>{/if}</li>
+							<li>
+								{if $userProfiles[$message->getUserID()]|isset}
+									{user object=$userProfiles[$message->getUserID()]}
+								{else}
+									<span class="username">{$message->getUsername()}</span>
+								{/if}
+							</li>
 							<li><span class="messagePublicationTime">{@$message->getTime()|time}</span></li>
 							
 							{event name='messageHeaderMetaData'}
@@ -60,4 +66,4 @@
 			</div>
 		</div>
 	</article>
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 908e16aab7..4362e984f8 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -17,7 +17,7 @@
 			
 			{if $userProfile->getAvatar()}
 				<div class="userAvatar">
-					<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" aria-hidden="true">{@$userProfile->getAvatar()->getImageTag(128)}</a>
+					{user object=$userProfile type='avatar128' ariaHidden='true'}
 					
 					{if MESSAGE_SIDEBAR_ENABLE_ONLINE_STATUS && !$isReply && $userProfile->isOnline()}<span class="badge green badgeOnline" title="{lang}wcf.user.online.title{/lang}">{lang}wcf.user.online{/lang}</span>{/if}
 				</div>
@@ -91,7 +91,7 @@
 					<dl class="plain dataList">
 						{content}
 							{if MODULE_LIKE && MESSAGE_SIDEBAR_ENABLE_LIKES_RECEIVED && !$isReply && $userProfile->likesReceived}
-								<dt><a href="{link controller='User' object=$userProfile}{/link}#likes" class="jsTooltip" title="{lang user=$userProfile}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.likesReceived{/lang}</a></dt>
+								<dt><a href="{$userProfile->getLink()}#likes" class="jsTooltip" title="{lang user=$userProfile}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.likesReceived{/lang}</a></dt>
 								<dd>{#$userProfile->likesReceived}</dd>
 							{/if}
 							
diff --git a/com.woltlab.wcf/templates/moderationArticle.tpl b/com.woltlab.wcf/templates/moderationArticle.tpl
index ba03e64ce0..f5c1048e0e 100644
--- a/com.woltlab.wcf/templates/moderationArticle.tpl
+++ b/com.woltlab.wcf/templates/moderationArticle.tpl
@@ -3,7 +3,7 @@
 		<header class="messageHeader">
 			<div class="box32 messageHeaderWrapper">
 				{if $article->getUserProfile()->userID}
-					<a href="{link controller='User' object=$article->getUserProfile()->getDecoratedObject()}{/link}" aria-hidden="true">{@$article->getUserProfile()->getAvatar()->getImageTag(32)}</a>
+					{user object=$article->getUserProfile() type='avatar32' ariaHidden='true'}
 				{else}
 					<span>{@$article->getUserProfile()->getAvatar()->getImageTag(32)}</span>
 				{/if}
@@ -16,7 +16,7 @@
 					<ul class="messageHeaderMetaData">
 						<li>
 							{if $article->getUserProfile()->userID}
-								<a href="{link controller='User' object=$article->getUserProfile()->getDecoratedObject()}{/link}" class="username">{$article->getUserProfile()}</a>
+								{user object=$article->getUserProfile() class='username'}
 							{else}
 								{$article->getUserProfile()->username}
 							{/if}
diff --git a/com.woltlab.wcf/templates/moderationComment.tpl b/com.woltlab.wcf/templates/moderationComment.tpl
index 54dca5a1ab..e5b99e771a 100644
--- a/com.woltlab.wcf/templates/moderationComment.tpl
+++ b/com.woltlab.wcf/templates/moderationComment.tpl
@@ -3,7 +3,7 @@
 		<header class="messageHeader">
 			<div class="box32 messageHeaderWrapper">
 				{if $message->userID}
-					<a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" aria-hidden="true">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
+					{user object=$message->getUserProfile() type='avatar32' ariaHidden='true'}
 				{else}
 					<span>{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</span>
 				{/if}
@@ -16,7 +16,7 @@
 					<ul class="messageHeaderMetaData">
 						<li>
 							{if $message->userID}
-								<a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="username">{$message->getUsername()}</a>
+								{user object=$message->getUserProfile() class='username'}
 							{else}
 								{$message->getUsername()}
 							{/if}
diff --git a/com.woltlab.wcf/templates/moderationQueueList.tpl b/com.woltlab.wcf/templates/moderationQueueList.tpl
index ff9081ac9c..b47d25449a 100644
--- a/com.woltlab.wcf/templates/moderationQueueList.tpl
+++ b/com.woltlab.wcf/templates/moderationQueueList.tpl
@@ -9,8 +9,8 @@
 					<span class="badge label">{$queue->getLabel()}</span>
 					<a href="{@$queue->getLink()}">{$queue->getAffectedObject()->getTitle()}</a>
 				</h3>
-				<small>{if $queue->getUserProfile()->userID}<a href="{link controller='User' object=$queue->getUserProfile()->getDecoratedObject()}{/link}">{$queue->getAffectedObject()->getUsername()}</a>{else}{$queue->getAffectedObject()->getUsername()}{/if} <span class="separatorLeft">{@$queue->lastChangeTime|time}</span></small>
+				<small>{if $queue->getUserProfile()->userID}{user object=$queue->getUserProfile()}{else}{$queue->getAffectedObject()->getUsername()}{/if} <span class="separatorLeft">{@$queue->lastChangeTime|time}</span></small>
 			</div>
 		</div>
 	</li>
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index bfabeeaa0a..b32b643700 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -59,9 +59,7 @@
 	
 	<div class="box32">
 		{if $reportUser->userID}
-			<a href="{link controller='User' object=$reportUser}{/link}" title="{$reportUser->username}">
-				{@$reportUser->getAvatar()->getImageTag(32)}
-			</a>
+			{user object=$reportUser type='avatar32' title=$reportUser->username}
 		{else}
 			<span>{@$reportUser->getAvatar()->getImageTag(32)}</span>
 		{/if}
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 0d76589716..be9a1508e1 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -80,7 +80,7 @@
 								<ul class="userAvatarList small">
 									{foreach from=$notification[event]->getAuthors() item=author}
 										{if $author->userID}
-											<li class="jsTooltip" title="{$author->username}"><a href="{link controller='User' object=$author}{/link}">{@$author->getAvatar()->getImageTag(24)}</a></li>
+											<li class="jsTooltip" title="{$author->username}">{user object=$author type='avatar24'}</li>
 										{/if}
 									{/foreach}
 								</ul>
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 3432a0a627..f48e6f2749 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -7,7 +7,7 @@
 		{if $__wcf->user->userID}
 			<!-- user menu -->
 			<li id="userMenu">
-				<a class="jsTooltip" href="{link controller='User' object=$__wcf->user}{/link}" title="{lang}wcf.user.controlPanel{/lang}">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)} <span>{lang}wcf.user.userNote{/lang}</span></a>
+				<a class="jsTooltip" href="{$__wcf->user->getLink()}" title="{lang}wcf.user.controlPanel{/lang}">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)} <span>{lang}wcf.user.userNote{/lang}</span></a>
 				<div class="interactiveDropdown interactiveDropdownStatic interactiveDropdownUserMenu">
 					<div class="interactiveDropdownHeader">
 						<span class="interactiveDropdownTitle">{lang}wcf.user.controlPanel{/lang}</span>
@@ -24,11 +24,11 @@
 						<ul class="interactiveDropdownItems interactiveDropdownItemsUserMenu">
 							<li>
 								<div class="box48">
-									<a href="{link controller='User' object=$__wcf->user}{/link}" aria-hidden="true">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(48)}</a>
+									{user object=$__wcf->getUserProfileHandler()->getUserProfile() type='avatar48' ariaHidden='true'}
 									
 									<div class="containerHeadline">
 										<h3>
-											<a href="{link controller='User' object=$__wcf->user}{/link}">{$__wcf->user->username}</a>
+											{user object=$__wcf->getUserProfileHandler()->getUserProfile()}
 											{if MODULE_USER_RANK}
 												{if $__wcf->getUserProfileHandler()->getUserTitle()}
 													<span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span>
@@ -40,7 +40,7 @@
 										</h3>
 										
 										<ul class="inlineList dotSeparated">
-											<li><a href="{link controller='User' object=$__wcf->user}{/link}">{lang}wcf.user.myProfile{/lang}</a></li>
+											<li><a href="{$__wcf->user->getLink()}">{lang}wcf.user.myProfile{/lang}</a></li>
 											{if $__wcf->getUserProfileHandler()->canEditOwnProfile()}<li><a href="{link controller='User' object=$__wcf->user}editOnInit=true#about{/link}" class="jsUserPanelEditProfile">{lang}wcf.user.editProfile{/lang}</a></li>{/if}
 											{if $__wcf->session->getPermission('admin.general.canUseAcp')}<li><a href="{link isACP=true}{/link}">{lang}wcf.global.acp.short{/lang}</a></li>{/if}
 										</ul>
diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index a560be0c06..56f5c39600 100644
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -89,7 +89,7 @@
 			{* logged-in *}
 			<li class="menuOverlayTitle">{lang}wcf.menu.user{/lang}</li>
 			<li class="menuOverlayItem">
-				<a href="{link controller='User' object=$__wcf->user}{/link}" class="menuOverlayItemLink box24">
+				<a href="{$__wcf->user->getLink()}" class="menuOverlayItemLink box24">
 					{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(24)}
 					<span class="menuOverlayItemTitle">{$__wcf->user->username}</span>
 				</a>
diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index 5db3ed6b89..b3bcc6ed3c 100644
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -1,7 +1,7 @@
 {foreach from=$eventList item=event}
 	<li>
 		<div class="box48{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID)} ignoredUserContent{/if}">
-			<a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}" aria-hidden="true">{@$event->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+			{user object=$event->getUserProfile() type='avatar48' title=$event->getUserProfile()->username ariaHidden='true'}
 			
 			<div>
 				<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl
index 457cdc8307..e58afa75c4 100644
--- a/com.woltlab.wcf/templates/searchResultList.tpl
+++ b/com.woltlab.wcf/templates/searchResultList.tpl
@@ -8,7 +8,7 @@
 					{if $_messageCustomIcon === ''}
 						{if $message->getUserProfile()}
 							{if $message->getUserProfile()->userID}
-								<a href="{link controller='User' object=$message->getUserProfile()}{/link}" title="{$message->getUserProfile()->username}" aria-hidden="true">{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+								{user object=$message->getUserProfile() type='avatar48' title=$message->getUserProfile()->username ariaHidden='true'}
 							{else}
 								<p>{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</p>
 							{/if}
diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index c0af1b6fcc..245abdf21a 100644
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -4,11 +4,11 @@
 			{foreach from=$users item=user}
 				<li data-object-id="{@$user->userID}">
 					<div class="box48">
-						<a href="{link controller='User' object=$user}{/link}" title="{$user->username}" aria-hidden="true">{@$user->getAvatar()->getImageTag(48)}</a>
+						{user object=$user type='avatar48' title=$user->username ariaHidden='true'}
 						
 						<div class="details userInformation">
 							<div class="containerHeadline">
-								<h3><a href="{link controller='User' object=$user}{/link}">{$user->username}</a>{if MODULE_USER_RANK}
+								<h3>{user object=$user}{if MODULE_USER_RANK}
 									{if $user->getUserTitle()}
 										<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
 									{/if}
diff --git a/com.woltlab.wcf/templates/userInformationStatistics.tpl b/com.woltlab.wcf/templates/userInformationStatistics.tpl
index 77290840fb..2a5799ba51 100644
--- a/com.woltlab.wcf/templates/userInformationStatistics.tpl
+++ b/com.woltlab.wcf/templates/userInformationStatistics.tpl
@@ -3,7 +3,7 @@
 {event name='statistics'}
 
 {if MODULE_LIKE && $user->likesReceived}
-	<dt>{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}<a href="{link controller='User' object=$user}{/link}#likes" class="jsTooltip" title="{lang}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.reactionsReceived{/lang}</a>{else}{lang}wcf.like.reactionsReceived{/lang}{/if}</dt>
+	<dt>{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}<a href="{$user->getLink()}#likes" class="jsTooltip" title="{lang}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.reactionsReceived{/lang}</a>{else}{lang}wcf.like.reactionsReceived{/lang}{/if}</dt>
 	<dd>{#$user->likesReceived}</dd>
 {/if}
 
diff --git a/com.woltlab.wcf/templates/userListItem.tpl b/com.woltlab.wcf/templates/userListItem.tpl
index 8f42dd8d6b..7ff5925921 100644
--- a/com.woltlab.wcf/templates/userListItem.tpl
+++ b/com.woltlab.wcf/templates/userListItem.tpl
@@ -1,9 +1,9 @@
 <li data-object-id="{@$user->userID}">
 	<div class="box48">
-		<a href="{link controller='User' object=$user}{/link}" title="{$user->username}" aria-hidden="true">{@$user->getAvatar()->getImageTag(48)}</a>
+		{user object=$user type='avatar48' title=$user->username ariaHidden='true'}
 		
 		<div class="details userInformation">
 			{include file='userInformation'}
 		</div>
 	</div>
-</li>
\ No newline at end of file
+</li>
diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index 675849fbb5..f283638476 100644
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -1,7 +1,7 @@
 {foreach from=$likeList item=like}
 	<li>
 		<div class="box48">
-			<a href="{link controller='User' object=$like->getUserProfile()}{/link}" title="{$like->getUserProfile()->username}" aria-hidden="true">{@$like->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+			{user object=$like->getUserProfile() type='avatar48' title=$like->getUserProfile()->username ariaHidden='true'}
 			
 			<div>
 				<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index e5c9e049b7..3106c79bdd 100644
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -2,7 +2,7 @@
 	<p>{lang}wcf.user.unknownUser{/lang}</p>
 {else}
 	<div class="box128 userProfilePreview">
-		<a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="userProfilePreviewAvatar">
+		<a href="{$user->getLink()}" title="{$user->username}" class="userProfilePreviewAvatar">
 			{@$user->getAvatar()->getImageTag(128)}
 			
 			{if $user->isOnline()}<span class="badge green badgeOnline">{lang}wcf.user.online{/lang}</span>{/if}
@@ -10,7 +10,7 @@
 		
 		<div class="userInformation">
 			{include file='userInformation' disableDialogLinks=true}
-
+			
 			{if MODULE_TROPHY && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($user->isAccessible('canViewTrophies') || $user->userID == $__wcf->session->userID) && $user->getSpecialTrophies()|count}
 				<div class="specialTrophyUserContainer">
 					<ul>
diff --git a/com.woltlab.wcf/templates/userSidebar.tpl b/com.woltlab.wcf/templates/userSidebar.tpl
index 218b0a9596..f49abe2a59 100644
--- a/com.woltlab.wcf/templates/userSidebar.tpl
+++ b/com.woltlab.wcf/templates/userSidebar.tpl
@@ -6,7 +6,7 @@
 			<div class="boxContent">
 				<ul class="userAvatarList">
 					{foreach from=$following item=followingUser}
-						<li><a href="{link controller='User' object=$followingUser}{/link}" title="{$followingUser->username}" class="jsTooltip">{@$followingUser->getAvatar()->getImageTag(48)}</a></li>
+						<li>{user object=$followingUser type='avatar48' title=$followingUser->username class='jsTooltip'}</li>
 					{/foreach}
 				</ul>
 				
@@ -24,7 +24,7 @@
 			<div class="boxContent">
 				<ul class="userAvatarList">
 					{foreach from=$followers item=follower}
-						<li><a href="{link controller='User' object=$follower}{/link}" title="{$follower->username}" class="jsTooltip">{@$follower->getAvatar()->getImageTag(48)}</a></li>
+						<li>{user object=$follower type='avatar48' title=$follower->username class='jsTooltip'}</li>
 					{/foreach}
 				</ul>
 					
@@ -42,7 +42,7 @@
 			<div class="boxContent">
 				<ul class="userAvatarList">
 					{foreach from=$visitors item=visitor}
-						<li><a href="{link controller='User' object=$visitor}{/link}" title="{$visitor->username} ({@$visitor->time|plainTime})" class="jsTooltip">{@$visitor->getAvatar()->getImageTag(48)}</a></li>
+						<li><a href="{$visitor->getLink()}" title="{$visitor->username} ({@$visitor->time|plainTime})" class="jsTooltip">{@$visitor->getAvatar()->getImageTag(48)}</a></li>
 					{/foreach}
 				</ul>
 					
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 466594bff0..6885dcac10 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -109,11 +109,11 @@
 		{capture append=usersOnlineList}
 			<li>
 				<div class="box48">
-					<a href="{link controller='User' object=$user}{/link}" title="{$user->username}" aria-hidden="true">{@$user->getAvatar()->getImageTag(48)}</a>
+					{user object=$user type='avatar48' title=$user->username ariaHidden='true'}
 					
 					<div class="details userInformation">
 						<div class="containerHeadline">
-							<h3><a href="{link controller='User' object=$user}{/link}" class="username">{@$user->getFormattedUsername()}</a>
+							<h3>{user object=$user}
 								{if MODULE_USER_RANK}
 									{if $user->getUserTitle()}
 										<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index 03a1f583e2..003e63e82e 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -11,14 +11,14 @@
 			*}data-is-image="{@$attachment->isImage}"{*
 		*}>
 			{if $attachment->tinyThumbnailType}
-				<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail">
+				<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 			{else}
 				<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
 			{/if}
 			
 			<div>
 				<div>
-					<p><a href="{link controller='Attachment' object=$attachment}{/link}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
+					<p><a href="{$attachment->getLink()}" target="_blank"{if $attachment->isImage} title="{$attachment->filename}" class="jsImageViewer"{/if}>{$attachment->filename}</a></p>
 					<small>{@$attachment->filesize|filesize}</small>
 				</div>
 				
@@ -26,9 +26,9 @@
 					<li><span class="button small jsDeleteButton" data-object-id="{@$attachment->attachmentID}" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</span></li>
 					{if $attachment->isImage}
 						{if $attachment->thumbnailType}
-							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}thumbnail=1{/link}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
+							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getThumbnailLink('thumbnail')}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
 						{/if}
-						<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{link controller='Attachment' object=$attachment}{/link}">{lang}wcf.attachment.insertFull{/lang}</span></li>
+						<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getLink()}">{lang}wcf.attachment.insertFull{/lang}</span></li>
 					{else}
 						<li><span class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</span></li>
 					{/if}
diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index cab157246c..276dea3b51 100644
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -107,16 +107,16 @@
 						<td class="columnID columnAttachmentID">{@$attachment->attachmentID}</td>
 						<td class="columnTitle columnFilename">
 							<div class="box64">
-								<a href="{link controller='Attachment' id=$attachment->attachmentID}{/link}"{if $attachment->isImage} class="jsImageViewer" title="{$attachment->filename}"{/if}>
+								<a href="{$attachment->getLink()}"{if $attachment->isImage} class="jsImageViewer" title="{$attachment->filename}"{/if}>
 									{if $attachment->tinyThumbnailType}
-										<img src="{link controller='Attachment' id=$attachment->attachmentID}tiny=1{/link}" class="attachmentTinyThumbnail" alt="">
+										<img src="{$attachment->getThumbnailLink('tiny')}" class="attachmentTinyThumbnail" alt="">
 									{else}
 										<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
 									{/if}
 								</a>
 								
 								<div>
-									<p><a href="{link controller='Attachment' id=$attachment->attachmentID}{/link}">{$attachment->filename|tableWordwrap}</a></p>
+									<p><a href="{$attachment->getLink()}">{$attachment->filename|tableWordwrap}</a></p>
 									<p><small>{if $attachment->userID}{if $__wcf->session->getPermission('admin.user.canEditUser')}<a href="{link controller='UserEdit' id=$attachment->userID}{/link}">{$attachment->username}</a>{else}{$attachment->username}{/if}{else}{lang}wcf.user.guest{/lang}{/if}</small></p>
 									{if $attachment->getContainerObject()}<p><small><a href="{$attachment->getContainerObject()->getLink()}">{$attachment->getContainerObject()->getTitle()|tableWordwrap}</a></small></p>{/if}
 								</div>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 9e65e44b8b..4674e806fd 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -5,7 +5,7 @@
 				<li id="userMenu" class="dropdown">
 					<a href="#" class="dropdownToggle jsTooltip" title="{$__wcf->user->username}">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</a>
 					<ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
-						<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}">{lang}wcf.user.myProfile{/lang}</a></li>
+						<li><a href="{$__wcf->user->getLink()}">{lang}wcf.user.myProfile{/lang}</a></li>
 						{if $__wcf->getUserProfileHandler()->canEditOwnProfile()}<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}editOnInit=true#about{/link}">{lang}wcf.user.editProfile{/lang}</a></li>{/if}
 						<li><a href="{link controller='Settings' forceFrontend=true}{/link}">{lang}wcf.user.menu.settings{/lang}</a></li>
 						
diff --git a/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php b/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
index da5c8b7474..04d91dfd78 100644
--- a/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
@@ -130,12 +130,9 @@ class UserProfileAction extends UserAction implements IPopoverAction {
 		$userID = reset($this->objectIDs);
 		
 		if ($userID) {
-			$userProfileList = new UserProfileList();
-			$userProfileList->getConditionBuilder()->add("user_table.userID = ?", [$userID]);
-			$userProfileList->readObjects();
-			
-			if (count($userProfileList)) {
-				WCF::getTPL()->assign('user', $userProfileList->getSingleObject());
+			$userProfile = UserProfileRuntimeCache::getInstance()->getObject($userID);
+			if ($userProfile) {
+				WCF::getTPL()->assign('user', $userProfile);
 			}
 			else {
 				WCF::getTPL()->assign('unknownUser', true);
-- 
2.20.1