From b5332f78228d27372576ae4586d6865b5c94104e Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 1 Jun 2020 15:05:21 +0200
Subject: [PATCH] Use UserTemplatePlugin

See #3321
---
 com.woltlab.wcf/templates/article.tpl                  |  6 +++---
 com.woltlab.wcf/templates/articleListItems.tpl         |  2 +-
 com.woltlab.wcf/templates/boxFollowingsOnline.tpl      |  2 +-
 com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl |  2 +-
 com.woltlab.wcf/templates/boxSidebarCommentList.tpl    |  2 +-
 com.woltlab.wcf/templates/boxStaffOnline.tpl           |  2 +-
 com.woltlab.wcf/templates/boxStatistics.tpl            |  2 +-
 com.woltlab.wcf/templates/boxTodaysBirthdays.tpl       |  4 ++--
 .../templates/boxTodaysFollowingBirthdays.tpl          |  2 +-
 com.woltlab.wcf/templates/boxUserList.tpl              |  2 +-
 com.woltlab.wcf/templates/boxUserTrophyList.tpl        |  4 ++--
 com.woltlab.wcf/templates/boxUsersOnline.tpl           |  2 +-
 com.woltlab.wcf/templates/boxUsersOnlineSidebar.tpl    |  4 ++--
 com.woltlab.wcf/templates/boxWhoWasOnline.tpl          |  4 ++--
 com.woltlab.wcf/templates/commentList.tpl              |  4 ++--
 com.woltlab.wcf/templates/commentResponseList.tpl      |  4 ++--
 com.woltlab.wcf/templates/mediaEditor.tpl              |  2 +-
 com.woltlab.wcf/templates/messageSidebar.tpl           |  2 +-
 com.woltlab.wcf/templates/moderationActivation.tpl     |  2 +-
 com.woltlab.wcf/templates/moderationList.tpl           | 10 ++++++++--
 com.woltlab.wcf/templates/moderationReport.tpl         |  4 ++--
 com.woltlab.wcf/templates/quoteMetaCode.tpl            |  2 +-
 com.woltlab.wcf/templates/recentActivityListItem.tpl   |  2 +-
 com.woltlab.wcf/templates/searchResultList.tpl         |  8 +++++++-
 com.woltlab.wcf/templates/trophy.tpl                   |  4 ++--
 com.woltlab.wcf/templates/userInformationHeadline.tpl  |  2 +-
 com.woltlab.wcf/templates/userProfileLikeItem.tpl      |  2 +-
 com.woltlab.wcf/templates/usersOnlineInfoBox.tpl       |  2 +-
 wcfsetup/install/files/acp/templates/mediaEditor.tpl   |  2 +-
 wcfsetup/install/files/js/WCF.Moderation.js            |  2 +-
 .../install/files/lib/data/user/UserProfile.class.php  |  2 +-
 .../handler/TUserOnlineLocationPageHandler.class.php   |  5 ++++-
 wcfsetup/install/lang/de.xml                           |  2 +-
 wcfsetup/install/lang/en.xml                           |  2 +-
 34 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 046024892e..0f9968fc49 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -21,8 +21,8 @@
 				<li itemprop="author" itemscope itemtype="http://schema.org/Person">
 					<span class="icon icon16 fa-user"></span>
 					{if $article->userID}
-						<a href="{link controller='User' id=$article->userID title=$article->username}{/link}" class="userLink" data-user-id="{@$article->userID}" itemprop="url">
-							<span itemprop="name">{$article->username}</span>
+						<a href="{$article->getUserProfile()->getLink()}" class="userLink" data-object-id="{@$article->userID}" itemprop="url">
+							<span itemprop="name">{@$article->getUserProfile()->getFormattedUsername()}</span>
 						</a>
 					{else}
 						<span itemprop="name">{$article->username}</span>
@@ -211,7 +211,7 @@
 					{event name='afterAboutAuthorText'}
 					
 					<div class="articleAboutAuthorUsername">
-						<a href="{link controller='User' object=$article->getUserProfile()->getDecoratedObject()}{/link}" class="username userLink" data-user-id="{@$article->getUserProfile()->userID}">{@$article->getUserProfile()->getFormattedUsername()}</a>
+						{user object=$article->getUserProfile() class='username'}
 						
 						{if MODULE_USER_RANK}
 							{if $article->getUserProfile()->getUserTitle()}
diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl
index dab3340756..cb2b593b0b 100644
--- a/com.woltlab.wcf/templates/articleListItems.tpl
+++ b/com.woltlab.wcf/templates/articleListItems.tpl
@@ -45,7 +45,7 @@
 				<div class="contentItemMetaContent">
 					<div class="contentItemMetaAuthor">
 						{if $article->userID}
-							<a href="{$article->getUserProfile()->getLink()}" class="userLink" data-user-id="{@$article->userID}">{$article->getUserProfile()->username}</a>
+							{user object=$article->getUserProfile()}
 						{else}
 							{$article->username}
 						{/if}
diff --git a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
index cf328bf506..e85904a373 100644
--- a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
+++ b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
@@ -4,7 +4,7 @@
 			<a href="{link controller='User' object=$userOnline}{/link}" aria-hidden="true">{@$userOnline->getAvatar()->getImageTag(32)}</a>
 			
 			<div class="sidebarItemTitle">
-				<h3><a href="{link controller='User' object=$userOnline}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{$userOnline->username}</a></h3>
+				<h3>{user object=$userOnline}</h3>
 				<small>{@$userOnline->lastActivityTime|time}</small>
 			</div>
 		</li>
diff --git a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
index 69151ea388..c7646b676a 100644
--- a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
@@ -5,7 +5,7 @@
 			
 			<div class="sidebarItemTitle">
 				<h3>
-					<a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
+					{user object=$event->getUserProfile()}
 					<small class="separatorLeft">{@$event->time|time}</small>
 				</h3>
 				<small>{@$event->getTitle()}</small>
diff --git a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
index ef1531678a..203bb8a554 100644
--- a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
+++ b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
@@ -6,7 +6,7 @@
 			</div>
 			
 			<p><small>{@$boxComment->getExcerpt(50)}</small></p>
-			<p><small>{if $boxComment->userID}<a href="{link controller='User' object=$boxComment->getUserProfile()}{/link}" class="userLink" data-user-id="{@$boxComment->userID}">{$boxComment->username}</a>{else}{$boxComment->username}{/if} <span class="separatorLeft">{@$boxComment->time|time}</span></small></p>
+			<p><small>{if $boxComment->userID}{user object=$boxComment->getUserProfile()}{else}{$boxComment->username}{/if} <span class="separatorLeft">{@$boxComment->time|time}</span></small></p>
 		</li>
 	{/foreach}
 </ul>
diff --git a/com.woltlab.wcf/templates/boxStaffOnline.tpl b/com.woltlab.wcf/templates/boxStaffOnline.tpl
index 6e464e7e2c..3a91b56c0a 100644
--- a/com.woltlab.wcf/templates/boxStaffOnline.tpl
+++ b/com.woltlab.wcf/templates/boxStaffOnline.tpl
@@ -6,7 +6,7 @@
 			<div class="sidebarItemTitle">
 				<h3>
 					{event name='beforeUsername'}
-					<a href="{link controller='User' object=$userOnline}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{$userOnline->username}</a>
+					{user object=$userOnline}
 				</h3>
 				{if MODULE_USER_RANK}
 					{if $userOnline->getUserTitle()}
diff --git a/com.woltlab.wcf/templates/boxStatistics.tpl b/com.woltlab.wcf/templates/boxStatistics.tpl
index 449883cbde..9a1f8dbfea 100644
--- a/com.woltlab.wcf/templates/boxStatistics.tpl
+++ b/com.woltlab.wcf/templates/boxStatistics.tpl
@@ -11,6 +11,6 @@
 	
 	{if $statistics[newestMember]}
 		<dt>{lang}wcf.user.newestMember{/lang}</dt>
-		<dd><a href="{link controller='User' object=$statistics[newestMember]}{/link}" class="userLink" data-user-id="{$statistics[newestMember]->userID}">{$statistics[newestMember]}</a></dd>
+		<dd>{user object=$statistics[newestMember]}</dd>
 	{/if}
 </dl>
diff --git a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
index 8c7a0daac9..77b5c83c5c 100644
--- a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
@@ -4,7 +4,7 @@
 			<a href="{link controller='User' object=$birthdayUserProfile}{/link}" aria-hidden="true">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
 			
 			<div class="sidebarItemTitle">
-				<h3><a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="userLink" data-user-id="{@$birthdayUserProfile->userID}">{$birthdayUserProfile->username}</a></h3>
+				<h3>{user object=$birthdayUserProfile}</h3>
 				<small>{$birthdayUserProfile->getBirthday()}</small>
 			</div>
 		</li>
@@ -25,4 +25,4 @@
 			});
 		});
 	</script>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
index 657133e1e6..d47a0a686c 100644
--- a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
@@ -4,7 +4,7 @@
 			<a href="{link controller='User' object=$birthdayUserProfile}{/link}" aria-hidden="true">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
 			
 			<div class="sidebarItemTitle">
-				<h3><a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="userLink" data-user-id="{@$birthdayUserProfile->userID}">{$birthdayUserProfile->username}</a></h3>
+				<h3>{user object=$birthdayUserProfile}</h3>
 				<small>{$birthdayUserProfile->getBirthday()}</small>
 			</div>
 		</li>
diff --git a/com.woltlab.wcf/templates/boxUserList.tpl b/com.woltlab.wcf/templates/boxUserList.tpl
index 69b4f987e3..7933ede988 100644
--- a/com.woltlab.wcf/templates/boxUserList.tpl
+++ b/com.woltlab.wcf/templates/boxUserList.tpl
@@ -4,7 +4,7 @@
 			<a href="{link controller='User' object=$boxUser}{/link}" aria-hidden="true">{@$boxUser->getAvatar()->getImageTag(24)}</a>
 			
 			<div class="sidebarItemTitle">
-				<h3><a href="{link controller='User' object=$boxUser}{/link}" class="userLink" data-user-id="{@$boxUser->userID}">{$boxUser->username}</a></h3>
+				<h3>{user object=$boxUser}</h3>
 				{capture assign='__boxUserLanguageItem'}{lang __optional=true}wcf.user.boxList.description.{$boxSortField}{/lang}{/capture}
 				{if $__boxUserLanguageItem}
 					<small>{@$__boxUserLanguageItem}</small>
diff --git a/com.woltlab.wcf/templates/boxUserTrophyList.tpl b/com.woltlab.wcf/templates/boxUserTrophyList.tpl
index 061b4b924b..bf16e8657f 100644
--- a/com.woltlab.wcf/templates/boxUserTrophyList.tpl
+++ b/com.woltlab.wcf/templates/boxUserTrophyList.tpl
@@ -9,7 +9,7 @@
 						<a href="{$boxUserTrophy->getTrophy()->getLink()}">{$boxUserTrophy->getTrophy()->getTitle()}</a>
 					</h3>
 					<small>
-						{@$boxUserTrophy->getUserProfile()->getAnchorTag()}
+						{user object=$boxUserTrophy->getUserProfile()}
 						<span class="separatorLeft">{@$boxUserTrophy->time|time}</span>
 					</small>
 				</div>
@@ -24,7 +24,7 @@
 
 				<div class="sidebarItemTitle">
 					<h3><a href="{$boxUserTrophy->getTrophy()->getLink()}">{$boxUserTrophy->getTrophy()->getTitle()}</a></h3>
-					<small>{if !$boxUserTrophy->getDescription()|empty}<p>{@$boxUserTrophy->getDescription()}</p>{/if}<p>{@$boxUserTrophy->getUserProfile()->getAnchorTag()} <span class="separatorLeft">{@$boxUserTrophy->time|time}</span></p></small>
+					<small>{if !$boxUserTrophy->getDescription()|empty}<p>{@$boxUserTrophy->getDescription()}</p>{/if}<p>{user object=$boxUserTrophy->getUserProfile()} <span class="separatorLeft">{@$boxUserTrophy->time|time}</span></p></small>
 				</div>
 			</li>
 		{/foreach}
diff --git a/com.woltlab.wcf/templates/boxUsersOnline.tpl b/com.woltlab.wcf/templates/boxUsersOnline.tpl
index cb88c70db4..e6f63aee50 100644
--- a/com.woltlab.wcf/templates/boxUsersOnline.tpl
+++ b/com.woltlab.wcf/templates/boxUsersOnline.tpl
@@ -6,7 +6,7 @@
 {if $usersOnlineList|count}
 	<ul class="inlineList commaSeparated">
 		{foreach from=$usersOnlineList->getObjects() item=userOnline}
-			<li><a href="{link controller='User' object=$userOnline->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{@$userOnline->getFormattedUsername()}</a></li>
+			<li>{user object=$userOnline}</li>
 		{/foreach}
 	</ul>
 {/if}
diff --git a/com.woltlab.wcf/templates/boxUsersOnlineSidebar.tpl b/com.woltlab.wcf/templates/boxUsersOnlineSidebar.tpl
index 79c45ba9b4..f713a8a160 100644
--- a/com.woltlab.wcf/templates/boxUsersOnlineSidebar.tpl
+++ b/com.woltlab.wcf/templates/boxUsersOnlineSidebar.tpl
@@ -1,7 +1,7 @@
 <ul class="inlineList commaSeparated small">
 	{foreach from=$usersOnlineList->getObjects() item=userOnline}
-		<li><a href="{link controller='User' object=$userOnline->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{@$userOnline->getFormattedUsername()}</a></li>
+		<li>{user object=$userOnline}</li>
 	{/foreach}
 </ul>
 
-<p><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD && $__showRecord} <span class="separatorLeft">{lang}wcf.user.usersOnline.record{/lang}</span>{/if}</small></p>
\ No newline at end of file
+<p><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD && $__showRecord} <span class="separatorLeft">{lang}wcf.user.usersOnline.record{/lang}</span>{/if}</small></p>
diff --git a/com.woltlab.wcf/templates/boxWhoWasOnline.tpl b/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
index f3424ad78c..f9a1fd45c2 100644
--- a/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
+++ b/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
@@ -1,13 +1,13 @@
 {if $whoWasOnlineList|count < 29}
 	<ul class="userAvatarList">
 		{foreach from=$whoWasOnlineList item=userOnline}
-			<li><a href="{link controller='User' object=$userOnline}{/link}" title="{$userOnline->username} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})" class="jsTooltip">{@$userOnline->getAvatar()->getImageTag(48)}</a></li>
+			<li><a href="{$userOnline->getLink()}" title="{$userOnline->username} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})" class="jsTooltip">{@$userOnline->getAvatar()->getImageTag(48)}</a></li>
 		{/foreach}
 	</ul>
 {else}
 	<ul class="inlineList commaSeparated">
 		{foreach from=$whoWasOnlineList item=userOnline}
-			<li><a href="{link controller='User' object=$userOnline->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{@$userOnline->getFormattedUsername()}</a> ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})</li>
+			<li>{user object=$userOnline} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})</li>
 		{/foreach}
 	</ul>
 {/if}
diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl
index 382f754ecb..f38c2f1173 100644
--- a/com.woltlab.wcf/templates/commentList.tpl
+++ b/com.woltlab.wcf/templates/commentList.tpl
@@ -28,8 +28,8 @@
 						<div class="containerHeadline">
 							<h3 itemprop="author" itemscope itemtype="http://schema.org/Person">
 								{if $comment->userID}
-									<a href="{link controller='User' object=$comment->getUserProfile()}{/link}" class="userLink" data-user-id="{@$comment->userID}" itemprop="url">
-										<span itemprop="name">{$comment->username}</span>
+									<a href="{$comment->getUserProfile()->getLink()}" class="userLink" data-object-id="{@$comment->userID}" itemprop="url">
+										<span itemprop="name">{@$comment->getUserProfile()->getFormattedUsername()}</span>
 									</a>
 								{else}
 									<span itemprop="name">{$comment->username}</span>
diff --git a/com.woltlab.wcf/templates/commentResponseList.tpl b/com.woltlab.wcf/templates/commentResponseList.tpl
index e19bdaebe8..7d57392073 100644
--- a/com.woltlab.wcf/templates/commentResponseList.tpl
+++ b/com.woltlab.wcf/templates/commentResponseList.tpl
@@ -20,8 +20,8 @@
 					<div class="containerHeadline">
 						<h3 itemprop="author" itemscope itemtype="http://schema.org/Person">
 							{if $response->userID}
-								<a href="{link controller='User' object=$response->getUserProfile()}{/link}" class="userLink" data-user-id="{@$response->userID}" itemprop="url">
-									<span itemprop="name">{$response->username}</span>
+								<a href="{$response->getUserProfile()->getLink()}" class="userLink" data-object-id="{@$response->userID}" itemprop="url">
+									<span itemprop="name">{@$response->getUserProfile()->getFormattedUsername()}</span>
 								</a>
 							{else}
 								<span itemprop="name">{$response->username}</span>
diff --git a/com.woltlab.wcf/templates/mediaEditor.tpl b/com.woltlab.wcf/templates/mediaEditor.tpl
index e6ffc7cfcb..9fecb7586c 100644
--- a/com.woltlab.wcf/templates/mediaEditor.tpl
+++ b/com.woltlab.wcf/templates/mediaEditor.tpl
@@ -24,7 +24,7 @@
 		{/if}
 		
 		<dt>{lang}wcf.media.uploader{/lang}</dt>
-		<dd id="mediaUploader">{@$media->getUserProfile()->getAnchorTag()}</dd>
+		<dd id="mediaUploader">{user object=$media->getUserProfile()}</dd>
 		
 		<dt>{lang}wcf.media.downloads{/lang}</dt>
 		<dd id="mediaDownloads">{#$media->downloads}</dd>
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index bdc5f892b1..908e16aab7 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -24,7 +24,7 @@
 			{/if}
 			
 			<div class="messageAuthorContainer">
-				<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="username userLink" data-user-id="{@$userProfile->userID}"{if $enableMicrodata} itemprop="url"{/if}>
+				<a href="{$userProfile->getLink()}" class="username userLink" data-object-id="{@$userProfile->userID}"{if $enableMicrodata} itemprop="url"{/if}>
 					<span{if $enableMicrodata} itemprop="name"{/if}>{@$userProfile->getFormattedUsername()}</span>
 				</a>
 				{if !$isReply}
diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 7e5875b047..d819d9f673 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -17,7 +17,7 @@
 				<dd>
 					<span>
 						{if $queue->assignedUserID}
-							<a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
+							<a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-object-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
 						{else}
 							{lang}wcf.moderation.assignedUser.nobody{/lang}
 						{/if}
diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index f9f30ea21f..1f3b4509ac 100644
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -111,7 +111,13 @@
 							</h3>
 							
 							<ul class="inlineList dotSeparated small messageGroupInfo">
-								<li class="messageGroupAuthor">{if $entry->getAffectedObject()->getUserID()}<a href="{link controller='User' id=$entry->getAffectedObject()->getUserID() title=$entry->getAffectedObject()->getUsername()}{/link}" class="userLink" data-user-id="{@$entry->getAffectedObject()->getUserID()}">{$entry->getAffectedObject()->getUsername()}</a>{else}{$entry->getAffectedObject()->getUsername()}{/if}</li>
+								<li class="messageGroupAuthor">
+									{if $entry->getAffectedObject()->getUserID()}
+										{user object=$entry->getUserProfile()}
+									{else}
+										{$entry->getAffectedObject()->getUsername()}
+									{/if}
+								</li>
 								<li class="messageGroupTime">{@$entry->getAffectedObject()->getTime()|time}</li>
 								<li>{lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}</li>
 								
@@ -125,7 +131,7 @@
 							
 							{if $entry->assignedUserID}
 								<small class="moderationQueueEntryAssignedUser">
-									{lang}wcf.moderation.assignedUser{/lang}: <a href="{link controller='User' id=$entry->assignedUserID}{/link}" class="userLink" data-user-id="{@$entry->assignedUserID}">{$entry->assignedUsername}</a>
+									{lang}wcf.moderation.assignedUser{/lang}: <a href="{link controller='User' id=$entry->assignedUserID}{/link}" class="userLink" data-object-id="{@$entry->assignedUserID}">{$entry->assignedUsername}</a>
 								</small>
 							{/if}
 							
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 197b5e2d36..bfabeeaa0a 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -17,7 +17,7 @@
 				<dd>
 					<span>
 						{if $queue->assignedUserID}
-							<a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
+							<a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-object-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
 						{else}
 							{lang}wcf.moderation.assignedUser.nobody{/lang}
 						{/if}
@@ -70,7 +70,7 @@
 			<div class="containerHeadline">
 				<h3>
 					{if $reportUser->userID}
-						<a href="{link controller='User' object=$reportUser}{/link}" class="userLink" data-user-id="{@$reportUser->userID}">{$reportUser->username}</a>
+						{user object=$reportUser}
 					{else}
 						{lang}wcf.user.guest{/lang}
 					{/if}
diff --git a/com.woltlab.wcf/templates/quoteMetaCode.tpl b/com.woltlab.wcf/templates/quoteMetaCode.tpl
index 61cfe8c3f4..1cdd2a6fe4 100644
--- a/com.woltlab.wcf/templates/quoteMetaCode.tpl
+++ b/com.woltlab.wcf/templates/quoteMetaCode.tpl
@@ -1,7 +1,7 @@
 <blockquote class="quoteBox collapsibleBbcode jsCollapsibleBbcode{if $collapseQuote} collapsed{/if}{if !$quoteAuthorObject} quoteBoxSimple{/if}"{if $quoteLink} cite="{$quoteLink}"{/if}>
 	<div class="quoteBoxIcon">
 		{if $quoteAuthorObject}
-			<a href="{link controller='User' object=$quoteAuthorObject}{/link}" class="userLink" data-user-id="{@$quoteAuthorObject->userID}" aria-hidden="true">{@$quoteAuthorObject->getAvatar()->getImageTag(64)}</a>
+			<a href="{$quoteAuthorObject->getLink()}" class="userLink" data-object-id="{@$quoteAuthorObject->userID}" aria-hidden="true">{@$quoteAuthorObject->getAvatar()->getImageTag(64)}</a>
 		{else}
 			<span class="quoteBoxQuoteSymbol"></span>
 		{/if}
diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index 7c847e04e5..5db3ed6b89 100644
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -7,7 +7,7 @@
 				<div class="containerHeadline">
 					<h3>
 						{event name='beforeUsername'}
-						<a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
+						{user object=$event->getUserProfile()}
 						<small class="separatorLeft">{@$event->time|time}</small>
 					</h3>
 					<div>{@$event->getTitle()}</div>
diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl
index 73cfcb75a4..457cdc8307 100644
--- a/com.woltlab.wcf/templates/searchResultList.tpl
+++ b/com.woltlab.wcf/templates/searchResultList.tpl
@@ -28,7 +28,13 @@
 							{if $message->getUserProfile() || $message->getTime() || $message->getContainerTitle()}
 								<ul class="inlineList dotSeparated">
 									{if $message->getUserProfile()}
-										<li>{if $message->getUserProfile()->userID}<a href="{link controller='User' object=$message->getUserProfile()}{/link}" class="userLink" data-user-id="{@$message->getUserProfile()->userID}">{$message->getUserProfile()->username}</a>{else}{$message->getUserProfile()->username}{/if}</li>
+										<li>
+											{if $message->getUserProfile()->userID}
+												{user object=$message->getUserProfile()}
+											{else}
+												{$message->getUserProfile()->username}
+											{/if}
+										</li>
 									{/if}
 									{if $message->getTime()}
 										<li><small>{@$message->getTime()|time}</small></li>
diff --git a/com.woltlab.wcf/templates/trophy.tpl b/com.woltlab.wcf/templates/trophy.tpl
index 621d4dfb45..20be7d57fc 100644
--- a/com.woltlab.wcf/templates/trophy.tpl
+++ b/com.woltlab.wcf/templates/trophy.tpl
@@ -45,7 +45,7 @@
 				<div>{@$userTrophy->getUserProfile()->getAvatar()->getImageTag(64)}</div>
 
 				<div class="sidebarItemTitle">
-					<h3>{@$userTrophy->getUserProfile()->getAnchorTag()}</h3>
+					<h3>{user object=$userTrophy->getUserProfile()}</h3>
 					<small>{if !$userTrophy->getDescription()|empty}<span class="separatorRight">{@$userTrophy->getDescription()}</span> {/if}{@$userTrophy->time|time}</small>
 				</div>
 			</li>
@@ -71,4 +71,4 @@
 	{/hascontent}
 </footer>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
diff --git a/com.woltlab.wcf/templates/userInformationHeadline.tpl b/com.woltlab.wcf/templates/userInformationHeadline.tpl
index b353ee698c..bf8832024a 100644
--- a/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@ -1,5 +1,5 @@
 <div class="containerHeadline">
-	<h3><a href="{link controller='User' object=$user}{/link}" class="username userLink" data-user-id="{@$user->userID}">{$user->username}</a>{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
+	<h3>{user object=$user class='username'}{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
 		{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/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index 37f666e605..675849fbb5 100644
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -6,7 +6,7 @@
 			<div>
 				<div class="containerHeadline">
 					<h3>
-						<a href="{link controller='User' object=$like->getUserProfile()}{/link}" class="userLink" data-user-id="{@$like->getUserProfile()->userID}">{$like->getUserProfile()->username}</a>
+						{user object=$like->getUserProfile()}
 						<small class="separatorLeft">{@$like->time|time}</small>
 					</h3>
 					<div>{@$like->getTitle()}</div>
diff --git a/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl b/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
index 1fb2b929ce..889dad480b 100644
--- a/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
@@ -12,7 +12,7 @@
 			{if $usersOnlineList|count}
 				<ul class="inlineList commaSeparated">
 					{foreach from=$usersOnlineList->getObjects() item=userOnline}
-						<li><a href="{link controller='User' object=$userOnline->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{@$userOnline->getFormattedUsername()}</a></li>
+						<li>{user object=$userOnline}</li>
 					{/foreach}
 				</ul>
 			{/if}
diff --git a/wcfsetup/install/files/acp/templates/mediaEditor.tpl b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
index e6ffc7cfcb..9fecb7586c 100644
--- a/wcfsetup/install/files/acp/templates/mediaEditor.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
@@ -24,7 +24,7 @@
 		{/if}
 		
 		<dt>{lang}wcf.media.uploader{/lang}</dt>
-		<dd id="mediaUploader">{@$media->getUserProfile()->getAnchorTag()}</dd>
+		<dd id="mediaUploader">{user object=$media->getUserProfile()}</dd>
 		
 		<dt>{lang}wcf.media.downloads{/lang}</dt>
 		<dd id="mediaDownloads">{#$media->downloads}</dd>
diff --git a/wcfsetup/install/files/js/WCF.Moderation.js b/wcfsetup/install/files/js/WCF.Moderation.js
index 1ad9e957f9..63cf11955a 100644
--- a/wcfsetup/install/files/js/WCF.Moderation.js
+++ b/wcfsetup/install/files/js/WCF.Moderation.js
@@ -179,7 +179,7 @@ if (COMPILER_TARGET_DEFAULT) {
 				case 'assignUser':
 					var $span = $('#moderationAssignedUserContainer > dd > span').empty();
 					if (data.returnValues.userID) {
-						$('<a href="' + data.returnValues.link + '" data-user-id="' + data.returnValues.userID + '" class="userLink">' + WCF.String.escapeHTML(data.returnValues.username) + '</a>').appendTo($span);
+						$('<a href="' + data.returnValues.link + '" data-object-id="' + data.returnValues.userID + '" class="userLink">' + WCF.String.escapeHTML(data.returnValues.username) + '</a>').appendTo($span);
 					}
 					else {
 						$span.append(data.returnValues.username);
diff --git a/wcfsetup/install/files/lib/data/user/UserProfile.class.php b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
index 2af52f43d9..4ec1b523d9 100644
--- a/wcfsetup/install/files/lib/data/user/UserProfile.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
@@ -1018,7 +1018,7 @@ class UserProfile extends DatabaseObjectDecorator implements ITitledLinkObject {
 	 * @return	string
 	 */
 	public function getAnchorTag() {
-		return '<a href="'.$this->getLink().'" class="userLink" data-user-id="'.$this->userID.'">'.StringUtil::encodeHTML($this->username).'</a>';
+		return '<a href="'.$this->getLink().'" class="userLink" data-object-id="'.$this->userID.'">'.StringUtil::encodeHTML($this->username).'</a>';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/page/handler/TUserOnlineLocationPageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/TUserOnlineLocationPageHandler.class.php
index 33ae932d5a..a3867eae23 100644
--- a/wcfsetup/install/files/lib/system/page/handler/TUserOnlineLocationPageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/page/handler/TUserOnlineLocationPageHandler.class.php
@@ -35,7 +35,10 @@ trait TUserOnlineLocationPageHandler {
 			return '';
 		}
 		
-		return WCF::getLanguage()->getDynamicVariable('wcf.page.onlineLocation.'.$page->identifier, ['user' => $userObject]);
+		return WCF::getLanguage()->getDynamicVariable('wcf.page.onlineLocation.'.$page->identifier, [
+			'user' => $userObject,
+			'userOnline' => $user,
+		]);
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 45a69ab012..c694939a0c 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4268,7 +4268,7 @@ Dateianhänge:
 		<item name="wcf.page.copyright"><![CDATA[<a href="https://www.woltlab.com/de/" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>Community-Software: <strong>WoltLab Suite&trade;{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}</strong></a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Article"><![CDATA[Artikel <a href="{$article->getLink()}">{$article->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.CategoryArticleList"><![CDATA[Artikel-Kategorie <a href="{$category->getLink()}">{$category->getTitle()}</a>]]></item>
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
+		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von {user object=$userOnline}]]></item>
 		<item name="wcf.page.availableUpdates"><![CDATA[Es sind <a href="{link controller='PackageUpdate' isACP=true}{/link}">Aktualisierungen für installierte Pakete</a> verfügbar.]]></item>
 		<item name="wcf.page.error.permissionDenied"><![CDATA[Der Zutritt zu dieser Seite ist {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} leider verwehrt. {if LANGUAGE_USE_INFORMAL_VARIANT}Du besitzt{else}Sie besitzen{/if} nicht die notwendigen Zugriffsrechte, um diese Seite aufrufen zu können.]]></item>
 		<item name="wcf.page.error.permissionDenied.title"><![CDATA[Zugriff verweigert]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 08d663091e..0ad6aaa0d4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4213,7 +4213,7 @@ Attachments:
 		<item name="wcf.page.copyright"><![CDATA[<a href="https://www.woltlab.com" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>Powered by <strong>WoltLab Suite&trade;{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}</strong></a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Article"><![CDATA[Article <a href="{$article->getLink()}">{$article->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.CategoryArticleList"><![CDATA[Article category <a href="{$category->getLink()}">{$category->getTitle()}</a>]]></item>
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
+		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of {user object=$userOnline}]]></item>
 		<item name="wcf.page.availableUpdates"><![CDATA[There are <a href="{link controller='PackageUpdate' isACP=true}{/link}">updates available</a> for installed packages.]]></item>
 		<item name="wcf.page.error.permissionDenied"><![CDATA[Access denied. You’re not authorized to view this page.]]></item>
 		<item name="wcf.page.error.permissionDenied.title"><![CDATA[Access Denied]]></item>
-- 
2.20.1