Use UserTemplatePlugin

See #3321

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 046024892e7662f813dbbf77b0466bde102fb3b1..0f9968fc49f9baa7002440bb54e2d32405b91819 100644 (file)
--- 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 dab3340756cc2e93efc1991320e596d529a959ee..cb2b593b0b6e44fe8aedc426cc73313ff179694c 100644 (file)
--- 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 cf328bf506648582e029036933033d9b151b3977..e85904a3736532c01f7b5253b5359c21507988e5 100644 (file)
--- 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 69151ea38844bcc318b7ecb17f818a7f2c434c22..c7646b676a958e84bae0bdf391bff4278796f5cf 100644 (file)
--- 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 ef1531678a6cc40ee5009b78fb4661f46e145e0a..203bb8a5545e559d105aa1d65d4e203b1bc1948d 100644 (file)
--- 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 6e464e7e2cc8c6226bc4a37c92305e7270126fb6..3a91b56c0a086a2a86491f24559e16436becf5a9 100644 (file)
--- 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 449883cbdea928d4e456fc294eafa717fb1bc98e..9a1f8dbfea393141d52030ed7d9fb6e3ff887208 100644 (file)
--- 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 8c7a0daac97933bd361f77506b447253c71d674d..77b5c83c5c359398c0a5260ea52facb4945dc143 100644 (file)
--- 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 657133e1e655a33c248692b5b8d838c7cf058d3d..d47a0a686cc484e1c1c24d90110063ea42dbc9a2 100644 (file)
--- 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 69b4f987e36b928d195b194122400d65dfd9ebdf..7933ede988e4c65e91a70269fc93f9df07b572d6 100644 (file)
--- 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 061b4b924b132bf24fe75d8ede34c8f63381e69b..bf16e8657f35eb0d06ae87d93e472a8777dd3acf 100644 (file)
--- 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 cb88c70db4ff26a9a32c566932f410e7f6eb3319..e6f63aee507fde66bde5e2e4aba76e901678d501 100644 (file)
--- 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 79c45ba9b4077a9170ad9c1b5ea910a3b45c848b..f713a8a1605223e6b365c9750298882820cecbd5 100644 (file)
--- 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 f3424ad78c4d7b525064c39e8c4965c5b5808326..f9a1fd45c2bc2896a5f14ab75c64aaaab5601ca0 100644 (file)
--- 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 382f754ecb6ad6476fe56cfa56ce7b94be9eb38d..f38c2f1173aa6e70f8a94dedc49f642a8f535acf 100644 (file)
--- 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 e19bdaebe8fb64e0be6ae06a52cb608c99e51cb0..7d573920735ac8975a8e3c2209fe2810b2236c46 100644 (file)
--- 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 e6ffc7cfcbecfeb7262b1b2ab2b70d32d4192ddd..9fecb7586c9e7c573a8322ca40b54ddfba122e90 100644 (file)
--- 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 bdc5f892b122f5ae2e8a1449279f2758da09c48f..908e16aab792303e3a045c63ca221c561bddda32 100644 (file)
--- 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 7e5875b0479eee3cbd1bfde572ce3d07e7c52711..d819d9f673b9f814af1de8b6c90cd3f97551ac6b 100644 (file)
--- 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 f9f30ea21fff01fdc737dce485189350c0e08c97..1f3b4509acfc57706941638d81104dd357fcc9f7 100644 (file)
--- 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 197b5e2d36a98e15cbac7cb2f0c5e053a933ef55..bfabeeaa0a7062bf8024ba3f18acd606afa6ba63 100644 (file)
--- 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 61cfe8c3f41b9fddf6ffe2732c8f99a1a932c702..1cdd2a6fe46fb91f247160801f6b83fcda2878e4 100644 (file)
--- 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 7c847e04e51488834584732f9f8d476201892bde..5db3ed6b89fc9938a52253e11eb2950eed7559b3 100644 (file)
--- 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 73cfcb75a4c99a178dc776a60ae82864cb2fb2bd..457cdc830785ebc8b1b5230b3a115e31c5e1c541 100644 (file)
--- 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 621d4dfb451fbdaee11cc7c571c1b4286b98f86a..20be7d57fcfda030436014537c3070a4e1a1fec1 100644 (file)
--- 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 b353ee698c170e8e176629cfbab0f19458310a86..bf8832024a61c623c2bc21fbbe664ca20f79aac2 100644 (file)
--- 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 37f666e605db421e92effa151040f0410c6f11af..675849fbb561a4270af90c604df1444f32cf3404 100644 (file)
--- 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 1fb2b929ceb0820843f8fc880c236d4bd4d1335a..889dad480bac94e7a66ad8564716e7cf91ab5fc9 100644 (file)
--- 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 e6ffc7cfcbecfeb7262b1b2ab2b70d32d4192ddd..9fecb7586c9e7c573a8322ca40b54ddfba122e90 100644 (file)
--- 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 1ad9e957f9cb82a818353f16722cd116079cbad6..63cf11955a8235e9b68f0223ec0dc40f5f2838b5 100644 (file)
--- 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 2af52f43d99c18182a1e09fe8b32254421b1c1d8..4ec1b523d9997ae3abff7de0de2be57323000883 100644 (file)
--- 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 33ae932d5a52a24f688884c67cbb0219c594a14c..a3867eae23d252a3318ed0c40b2a6b0775bc7ab0 100644 (file)
--- 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 45a69ab0126084b2d205328ed32708ea015e46f1..c694939a0c41f67aa5466ead2207897d5d1c828c 100644 (file)
--- 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 08d663091e43a773b2b43ff6490d13f2632f246a..0ad6aaa0d4b4c4246a283a1ae3a627e4e39e7cb1 100644 (file)
--- 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>