From c8f48ad8c2bf329520821a9a598147e3ff75a5d7 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sun, 14 Feb 2021 12:44:39 +0100 Subject: [PATCH] Use guest support of UserFunctionTemplatePlugin See #3989 --- com.woltlab.wcf/templates/articleListItems.tpl | 6 +----- com.woltlab.wcf/templates/authorSidebarBox.tpl | 6 +----- .../templates/boxSidebarCommentList.tpl | 2 +- com.woltlab.wcf/templates/commentList.tpl | 6 +----- com.woltlab.wcf/templates/commentResponseList.tpl | 6 +----- com.woltlab.wcf/templates/messageQuoteList.tpl | 8 +------- com.woltlab.wcf/templates/moderationArticle.tpl | 14 ++------------ com.woltlab.wcf/templates/moderationComment.tpl | 14 ++------------ com.woltlab.wcf/templates/moderationReport.tpl | 13 ++----------- .../templates/recentActivityListItem.tpl | 2 +- com.woltlab.wcf/templates/searchResultList.tpl | 14 ++------------ com.woltlab.wcf/templates/userBirthdayList.tpl | 2 +- com.woltlab.wcf/templates/userListItem.tpl | 2 +- com.woltlab.wcf/templates/userProfileLikeItem.tpl | 2 +- 14 files changed, 18 insertions(+), 79 deletions(-) diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl index cb2b593b0b..28c09c6d65 100644 --- a/com.woltlab.wcf/templates/articleListItems.tpl +++ b/com.woltlab.wcf/templates/articleListItems.tpl @@ -44,11 +44,7 @@
- {if $article->userID} - {user object=$article->getUserProfile()} - {else} - {$article->username} - {/if} + {user object=$article->getUserProfile()}
{@$article->time|time} diff --git a/com.woltlab.wcf/templates/authorSidebarBox.tpl b/com.woltlab.wcf/templates/authorSidebarBox.tpl index b7b18321e0..1a46241050 100644 --- a/com.woltlab.wcf/templates/authorSidebarBox.tpl +++ b/com.woltlab.wcf/templates/authorSidebarBox.tpl @@ -5,11 +5,7 @@

- {if $userProfile->userID} - {user object=$userProfile} - {else} - {$userProfile->username} - {/if} + {user object=$userProfile}

{if MODULE_USER_RANK} {if $userProfile->getUserTitle()} diff --git a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl index e47a933bf1..d098e42984 100644 --- a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl +++ b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl @@ -9,7 +9,7 @@ {@$boxComment->getExcerpt(50)}
- {if $boxComment->userID}{user object=$boxComment->getUserProfile()}{else}{$boxComment->username}{/if} {@$boxComment->time|time} + {user object=$boxComment->getUserProfile()} {@$boxComment->time|time}
{/foreach} diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl index 6e577321e5..41117aca15 100644 --- a/com.woltlab.wcf/templates/commentList.tpl +++ b/com.woltlab.wcf/templates/commentList.tpl @@ -13,11 +13,7 @@ data-responses="{@$comment->responses}" data-last-response-time="{if $commentLastResponseTime|empty}{@$comment->getLastResponseTime()}{else}{@$commentLastResponseTime}{/if}" data-is-disabled="{@$comment->isDisabled}" >
- {if $comment->userID} - {user object=$comment->getUserProfile() type='avatar48' title=$comment->getUserProfile()->username} - {else} - {@$comment->getUserProfile()->getAvatar()->getImageTag(48)} - {/if} + {user object=$comment->getUserProfile() type='avatar48'}
diff --git a/com.woltlab.wcf/templates/commentResponseList.tpl b/com.woltlab.wcf/templates/commentResponseList.tpl index a772b15695..a55bc3c486 100644 --- a/com.woltlab.wcf/templates/commentResponseList.tpl +++ b/com.woltlab.wcf/templates/commentResponseList.tpl @@ -6,11 +6,7 @@ {else}
  • 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}">
    - {if $response->userID} - {user object=$response->getUserProfile() type='avatar48' title=$response->getUserProfile()->username} - {else} - {@$response->getUserProfile()->getAvatar()->getImageTag(32)} - {/if} + {user object=$response->getUserProfile() type='avatar48'}
    diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl index 4ca4c8c1b1..fcff3a42f5 100644 --- a/com.woltlab.wcf/templates/messageQuoteList.tpl +++ b/com.woltlab.wcf/templates/messageQuoteList.tpl @@ -16,13 +16,7 @@
      -
    • - {if $userProfiles[$message->getUserID()]|isset} - {user object=$userProfiles[$message->getUserID()]} - {else} - {$message->getUsername()} - {/if} -
      • +
    • {if $userProfiles[$message->getUserID()]|isset}{user object=$userProfiles[$message->getUserID()]}{else}{$message->getUsername()}{/if}
    • {@$message->getTime()|time}
      • {event name='messageHeaderMetaData'} diff --git a/com.woltlab.wcf/templates/moderationArticle.tpl b/com.woltlab.wcf/templates/moderationArticle.tpl index f5c1048e0e..8a87f6d15a 100644 --- a/com.woltlab.wcf/templates/moderationArticle.tpl +++ b/com.woltlab.wcf/templates/moderationArticle.tpl @@ -2,11 +2,7 @@
      - {if $article->getUserProfile()->userID} - {user object=$article->getUserProfile() type='avatar32' ariaHidden='true'} - {else} - {@$article->getUserProfile()->getAvatar()->getImageTag(32)} - {/if} + {user object=$article->getUserProfile() type='avatar32' ariaHidden='true'}

      @@ -14,13 +10,7 @@

        -
      • - {if $article->getUserProfile()->userID} - {user object=$article->getUserProfile() class='username'} - {else} - {$article->getUserProfile()->username} - {/if} -
        • +
      • {user object=$article->getUserProfile() class='username'}
      • {@$article->time|time}
        • {event name='messageHeaderMetaData'} diff --git a/com.woltlab.wcf/templates/moderationComment.tpl b/com.woltlab.wcf/templates/moderationComment.tpl index e5b99e771a..981c13ef32 100644 --- a/com.woltlab.wcf/templates/moderationComment.tpl +++ b/com.woltlab.wcf/templates/moderationComment.tpl @@ -2,11 +2,7 @@
        - {if $message->userID} - {user object=$message->getUserProfile() type='avatar32' ariaHidden='true'} - {else} - {@$message->getUserProfile()->getAvatar()->getImageTag(32)} - {/if} + {user object=$message->getUserProfile() type='avatar32' ariaHidden='true'}

        @@ -14,13 +10,7 @@

          -
        • - {if $message->userID} - {user object=$message->getUserProfile() class='username'} - {else} - {$message->getUsername()} - {/if} -
          • +
        • {user object=$message->getUserProfile() class='username'}
        • {@$message->getTime()|time}
          • {event name='messageHeaderMetaData'} diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl index 38e354d3ad..e7de90e93c 100644 --- a/com.woltlab.wcf/templates/moderationReport.tpl +++ b/com.woltlab.wcf/templates/moderationReport.tpl @@ -61,21 +61,12 @@

          {lang}wcf.moderation.report.reportedBy{/lang}

          - {if $reportUser->userID} - {user object=$reportUser type='avatar32' title=$reportUser->username} - {else} - {@$reportUser->getAvatar()->getImageTag(32)} - {/if} + {user object=$reportUser type='avatar32'}

          - {if $reportUser->userID} - {user object=$reportUser} - {else} - {lang}wcf.user.guest{/lang} - {/if} - + {user object=$reportUser} {@$queue->time|time}

          diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl index dcb5e9d4cb..005264a7a6 100644 --- a/com.woltlab.wcf/templates/recentActivityListItem.tpl +++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl @@ -1,7 +1,7 @@ {foreach from=$eventList item=event}
        • - {user object=$event->getUserProfile() type='avatar48' title=$event->getUserProfile()->username ariaHidden='true'} + {user object=$event->getUserProfile() type='avatar48' ariaHidden='true'}
          diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl index e58afa75c4..943090b2f9 100644 --- a/com.woltlab.wcf/templates/searchResultList.tpl +++ b/com.woltlab.wcf/templates/searchResultList.tpl @@ -7,11 +7,7 @@ {assign var=_messageCustomIcon value=$customIcons[$_messageObjectHash]} {if $_messageCustomIcon === ''} {if $message->getUserProfile()} - {if $message->getUserProfile()->userID} - {user object=$message->getUserProfile() type='avatar48' title=$message->getUserProfile()->username ariaHidden='true'} - {else} -

          {@$message->getUserProfile()->getAvatar()->getImageTag(48)}

          - {/if} + {user object=$message->getUserProfile() type='avatar48' ariaHidden='true'} {else}

          {/if} @@ -28,13 +24,7 @@ {if $message->getUserProfile() || $message->getTime() || $message->getContainerTitle()}
            {if $message->getUserProfile()} -
          • - {if $message->getUserProfile()->userID} - {user object=$message->getUserProfile()} - {else} - {$message->getUserProfile()->username} - {/if} -
            • +
          • {user object=$message->getUserProfile()}
            • {/if} {if $message->getTime()}
          • {@$message->getTime()|time}
            • diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl index 2ad11bec35..0b4bf74ef4 100644 --- a/com.woltlab.wcf/templates/userBirthdayList.tpl +++ b/com.woltlab.wcf/templates/userBirthdayList.tpl @@ -4,7 +4,7 @@ {foreach from=$users item=user}
          • - {user object=$user type='avatar48' title=$user->username ariaHidden='true'} + {user object=$user type='avatar48' ariaHidden='true'}
            diff --git a/com.woltlab.wcf/templates/userListItem.tpl b/com.woltlab.wcf/templates/userListItem.tpl index 7ff5925921..d7d79ef83a 100644 --- a/com.woltlab.wcf/templates/userListItem.tpl +++ b/com.woltlab.wcf/templates/userListItem.tpl @@ -1,6 +1,6 @@
          • - {user object=$user type='avatar48' title=$user->username ariaHidden='true'} + {user object=$user type='avatar48' ariaHidden='true'}
            {include file='userInformation'} diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl index f283638476..fd11ee9108 100644 --- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl +++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl @@ -1,7 +1,7 @@ {foreach from=$likeList item=like}
          • - {user object=$like->getUserProfile() type='avatar48' title=$like->getUserProfile()->username ariaHidden='true'} + {user object=$like->getUserProfile() type='avatar48' ariaHidden='true'}
            -- 2.20.1