From 3488b3c1d082d245b9256b0fb071e0beef084a3b Mon Sep 17 00:00:00 2001 From: Cyperghost Date: Thu, 12 Jun 2025 11:18:40 +0200 Subject: [PATCH 1/3] Remove unnecessary `@` and replace all other `@` with `unsafe:` --- com.woltlab.wcf/templates/__messageFormPoll.tpl | 6 +++--- .../templates/__messageFormPollInline.tpl | 2 +- .../templates/messageFormMultilingualism.tpl | 6 +++--- .../templates/messageFormSettingsInline.tpl | 2 +- .../templates/messageFormTabsInline.tpl | 2 +- .../templates/messageQuickReplyGuestDialog.tpl | 2 +- com.woltlab.wcf/templates/messageSidebar.tpl | 16 ++++++++-------- .../templates/shared_messageTableOfContents.tpl | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl index 6ddb5e6abeb..565af29b8b2 100644 --- a/com.woltlab.wcf/templates/__messageFormPoll.tpl +++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl @@ -8,7 +8,7 @@ new UiPollEditor( "pollOptionContainer", - [ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{@$pollOption[optionValue]|encodeJS}' }{/implode} ], + [ {implode from=$pollOptions item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ], "", { maxOptions: {POLL_MAX_OPTIONS} @@ -51,7 +51,7 @@ {if $errorField == 'pollEndTime'} - {lang}wcf.poll.endTime.error.{@$errorType}{/lang} + {lang}wcf.poll.endTime.error.{$errorType}{/lang} {/if} @@ -64,7 +64,7 @@ {if $errorField == 'pollMaxVotes'} - {lang}wcf.poll.maxVotes.error.{@$errorType}{/lang} + {lang}wcf.poll.maxVotes.error.{$errorType}{/lang} {/if} diff --git a/com.woltlab.wcf/templates/__messageFormPollInline.tpl b/com.woltlab.wcf/templates/__messageFormPollInline.tpl index e92a4bcaeda..13b6208e885 100644 --- a/com.woltlab.wcf/templates/__messageFormPollInline.tpl +++ b/com.woltlab.wcf/templates/__messageFormPollInline.tpl @@ -8,7 +8,7 @@ new UiPollEditor( "pollOptionContainer_{$wysiwygSelector}", - [ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{@$pollOption[optionValue]|encodeJS}' }{/implode} ], + [ {implode from=$pollOptions item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ], "{$wysiwygSelector}", { isAjax: true, diff --git a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl index dfcd5665212..6176e9bd973 100644 --- a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl +++ b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl @@ -21,9 +21,9 @@ require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) { var languages = { {implode from=$availableContentLanguages item=_language} - '{@$_language->languageID}': { - iconPath: '{@$_language->getIconPath()|encodeJS}', - languageName: '{@$_language|encodeJS}' + '{$_language->languageID}': { + iconPath: '{unsafe:$_language->getIconPath()|encodeJS}', + languageName: '{unsafe:$_language|encodeJS}' } {/implode} }; diff --git a/com.woltlab.wcf/templates/messageFormSettingsInline.tpl b/com.woltlab.wcf/templates/messageFormSettingsInline.tpl index 2c0ff322e9d..e98bb3f750d 100644 --- a/com.woltlab.wcf/templates/messageFormSettingsInline.tpl +++ b/com.woltlab.wcf/templates/messageFormSettingsInline.tpl @@ -8,7 +8,7 @@ {if $__messageFormSettingsInlineSettings}
- {@$__messageFormSettingsInlineSettings} + {unsafe:$__messageFormSettingsInlineSettings}
{/if} diff --git a/com.woltlab.wcf/templates/messageFormTabsInline.tpl b/com.woltlab.wcf/templates/messageFormTabsInline.tpl index d11d8a6a92d..25193b26d3b 100644 --- a/com.woltlab.wcf/templates/messageFormTabsInline.tpl +++ b/com.woltlab.wcf/templates/messageFormTabsInline.tpl @@ -59,7 +59,7 @@ {include file='shared_messageFormAttachments'} {/if} - {if $__messageFormSettingsInlineContent}{@$__messageFormSettingsInlineContent}{/if} + {if $__messageFormSettingsInlineContent}{unsafe:$__messageFormSettingsInlineContent}{/if} {include file='__messageFormPollInline'} diff --git a/com.woltlab.wcf/templates/messageQuickReplyGuestDialog.tpl b/com.woltlab.wcf/templates/messageQuickReplyGuestDialog.tpl index daf02b5b76a..ec96ff0fd5e 100644 --- a/com.woltlab.wcf/templates/messageQuickReplyGuestDialog.tpl +++ b/com.woltlab.wcf/templates/messageQuickReplyGuestDialog.tpl @@ -19,5 +19,5 @@ {include file='shared_captcha'}
- +
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl index 8381f614965..7613789e9ab 100644 --- a/com.woltlab.wcf/templates/messageSidebar.tpl +++ b/com.woltlab.wcf/templates/messageSidebar.tpl @@ -24,8 +24,8 @@ {/if}
- {if !$isReply} {if $userProfile->banned} @@ -45,7 +45,7 @@ {event name='beforeUserTitle'} {if MODULE_USER_RANK && $userProfile->getUserTitle()} - {$userProfile->getUserTitle()} + {$userProfile->getUserTitle()} {/if} {event name='afterUserTitle'} @@ -54,7 +54,7 @@ {/hascontent} {if MODULE_USER_RANK && $userProfile->getRank() && $userProfile->getRank()->rankImage} -
{@$userProfile->getRank()->getImage()}
+
{unsafe:$userProfile->getRank()->getImage()}
{/if} {/if} @@ -62,14 +62,14 @@
{/if} {else}
- {@$userProfile->getAvatar()->getImageTag(128)} + {unsafe:$userProfile->getAvatar()->getImageTag(128)}
@@ -100,7 +100,7 @@ {/if} {if MESSAGE_SIDEBAR_ENABLE_ACTIVITY_POINTS && $userProfile->activityPoints} -
{lang}wcf.user.activityPoint{/lang}
+
{lang}wcf.user.activityPoint{/lang}
{#$userProfile->activityPoints}
{/if} @@ -118,7 +118,7 @@ {assign var='__formattedUserOption' value=$userProfile->getFormattedUserOption($__sidebarUserOption)} {if $__formattedUserOption}
{lang}wcf.user.option.{$__sidebarUserOption}{/lang}
-
{@$__formattedUserOption}
+
{unsafe:$__formattedUserOption}
{/if} {/if} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_messageTableOfContents.tpl b/com.woltlab.wcf/templates/shared_messageTableOfContents.tpl index a42c40b2cdc..be859f23d83 100644 --- a/com.woltlab.wcf/templates/shared_messageTableOfContents.tpl +++ b/com.woltlab.wcf/templates/shared_messageTableOfContents.tpl @@ -9,10 +9,10 @@
  • {$item->getTitle()} - {if $item->hasChildren()}
      {else}{/if} + {if $item->hasChildren()}
        {else}{/if} {if !$item->hasChildren() && $item->isLastSibling()} - {@"
      "|str_repeat:$item->getOpenParentNodes()} + {unsafe:"
    • "|str_repeat:$item->getOpenParentNodes()} {/if} {/foreach} From 0be21652cfdfb707420ca130e842f7d42a74ce44 Mon Sep 17 00:00:00 2001 From: Cyperghost Date: Thu, 12 Jun 2025 11:21:12 +0200 Subject: [PATCH 2/3] Use the `time` TemplatePlugin and no longer the deprecated `time` TemplateModifier. --- com.woltlab.wcf/templates/__messageFormPoll.tpl | 2 +- com.woltlab.wcf/templates/__messageFormPollInline.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl index 565af29b8b2..9782c3c5a20 100644 --- a/com.woltlab.wcf/templates/__messageFormPoll.tpl +++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl @@ -48,7 +48,7 @@
    - + {if $errorField == 'pollEndTime'} {lang}wcf.poll.endTime.error.{$errorType}{/lang} diff --git a/com.woltlab.wcf/templates/__messageFormPollInline.tpl b/com.woltlab.wcf/templates/__messageFormPollInline.tpl index 13b6208e885..99a1e7bce29 100644 --- a/com.woltlab.wcf/templates/__messageFormPollInline.tpl +++ b/com.woltlab.wcf/templates/__messageFormPollInline.tpl @@ -39,7 +39,7 @@
    - +
    From 5f37b4ca757050a6b98223fd8c4667e5c1d7335c Mon Sep 17 00:00:00 2001 From: Cyperghost Date: Mon, 16 Jun 2025 10:45:45 +0200 Subject: [PATCH 3/3] Remove unnecessary `@` and replace all other `@` with `unsafe:` --- com.woltlab.wcf/templates/poll.tpl | 6 +++--- com.woltlab.wcf/templates/pollResult.tpl | 4 ++-- com.woltlab.wcf/templates/pollVote.tpl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl index c6c9ba5640a..b6aa14f15a1 100644 --- a/com.woltlab.wcf/templates/poll.tpl +++ b/com.woltlab.wcf/templates/poll.tpl @@ -7,14 +7,14 @@ {/if} -

    {$poll->question} {#$poll->votes}

    diff --git a/com.woltlab.wcf/templates/pollResult.tpl b/com.woltlab.wcf/templates/pollResult.tpl index 5c3b239a664..2da65d7de5e 100644 --- a/com.woltlab.wcf/templates/pollResult.tpl +++ b/com.woltlab.wcf/templates/pollResult.tpl @@ -3,10 +3,10 @@
  • {$option->optionValue} ({#$option->votes}) - {@$option->getRelativeVotes($poll)}% + {$option->getRelativeVotes($poll)}%
    -
    +
    • {/foreach} diff --git a/com.woltlab.wcf/templates/pollVote.tpl b/com.woltlab.wcf/templates/pollVote.tpl index f184513069a..c9ccf9e3d69 100644 --- a/com.woltlab.wcf/templates/pollVote.tpl +++ b/com.woltlab.wcf/templates/pollVote.tpl @@ -1,9 +1,9 @@ -
    +
    {foreach from=$poll->getOptions() item=option}