Skip to content

Commit 631edcf

Browse files
committed
Use unsafe: when outputting strings in JavaScript that were previously encoded with encodeJS.
1 parent 184069a commit 631edcf

8 files changed

+9
-9
lines changed

com.woltlab.wcf/templates/shared_fileProcessorFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{if $field->isBigPreview()}true{else}false{/if},
2727
{if $field->isSimpleReplace()}true{else}false{/if},
2828
{if $field->isHideDeleteButton()}true{else}false{/if},
29-
{if $field->getThumbnailSize() === null}undefined{else}'{$field->getThumbnailSize()|encodeJS}'{/if},
29+
{if $field->getThumbnailSize() === null}undefined{else}'{unsafe:$field->getThumbnailSize()|encodeJS}'{/if},
3030
[{implode from=$actionButtons item=actionButton}{
3131
title: '{unsafe:$actionButton['title']|encodeJS}',
3232
icon: {if $actionButton['icon'] === null}undefined{else}'{unsafe:$actionButton['icon']->toHtml()|encodeJS}'{/if},

com.woltlab.wcf/templates/shared_labelFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
3333
new FormBuilderFieldLabel(
3434
'{unsafe:$field->getPrefixedId()|encodeJS}',
35-
{if $field->getValue()}'{$field->getValue()|encodeJS}'{else}null{/if},
35+
{if $field->getValue()}'{unsafe:$field->getValue()|encodeJS}'{else}null{/if},
3636
{
3737
forceSelection: {if $field->getLabelGroup()->forceSelection}true{else}false{/if}
3838
}

com.woltlab.wcf/templates/shared_messageFormSmileyTab.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<script data-relocate="true">
4343
require(['WoltLabSuite/Core/Ui/Smiley/Insert'], function (UiSmileyInsert) {
44-
new UiSmileyInsert('{if $wysiwygSelector|isset}{$wysiwygSelector|encodeJS}{else}text{/if}');
44+
new UiSmileyInsert('{if $wysiwygSelector|isset}{unsafe:$wysiwygSelector|encodeJS}{else}text{/if}');
4545
});
4646
</script>
4747
</div>

com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
var pollEditor = new UiPollEditor(
1717
DomUtil.identify(DomTraverse.childByTag(elById('{unsafe:$field->getPrefixedId()|encodeJS}Container'), 'DD')),
18-
[ {implode from=$field->getValue() item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ],
18+
[ {implode from=$field->getValue() item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ],
1919
'{unsafe:$field->getPrefixedWysiwygId()|encodeJS}',
2020
{
2121
isAjax: {if $field->getDocument()->isAjax()}true{else}false{/if},

com.woltlab.wcf/templates/shared_tabFormContainer.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
<script data-relocate="true">
1212
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/Tab'], function(TabContainerDependency) {
13-
new TabContainerDependency('{$container->getPrefixedId()|encodeJS}Container');
13+
new TabContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
1414
});
1515
</script>

com.woltlab.wcf/templates/shared_valueFormFieldDependency.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Value'], function(Valu
33
new ValueFieldDependency(
44
'{unsafe:$dependency->getDependentNode()->getPrefixedId()|encodeJS}Container',
55
'{unsafe:$dependency->getField()->getPrefixedId()|encodeJS}'
6-
).values([ {implode from=$dependency->getValues() item=dependencyValue}'{$dependencyValue|encodeJS}'{/implode} ])
6+
).values([ {implode from=$dependency->getValues() item=dependencyValue}'{unsafe:$dependencyValue|encodeJS}'{/implode} ])
77
.negate({if $dependency->isNegated()}true{else}false{/if});
88
});

com.woltlab.wcf/templates/shared_wysiwygQuoteFormContainer.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
<script data-relocate="true">
55
require(["WoltLabSuite/Core/Component/Quote/List"], ({ setup }) => {
6-
setup("{$container->getWysiwygId()|encodeJS}", "{$container->getPrefixedId()|encodeJS}Container");
6+
setup("{unsafe:$container->getWysiwygId()|encodeJS}", "{unsafe:$container->getPrefixedId()|encodeJS}Container");
77
});
88
</script>
99

1010
{include file='shared_formContainerDependencies'}
1111

1212
<script data-relocate="true">
1313
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTab'], ({ WysiwygTab }) => {
14-
new WysiwygTab('{$container->getPrefixedId()|encodeJS}Container', '{$container->getName()|encodeJS}', '{$container->getWysiwygId()|encodeJS}');
14+
new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getWysiwygId()|encodeJS}');
1515
});
1616
</script>

com.woltlab.wcf/templates/shared_wysiwygTabFormContainer.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
<script data-relocate="true">
1212
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTab'], ({ WysiwygTab }) => {
13-
new WysiwygTab('{$container->getPrefixedId()|encodeJS}Container', '{$container->getName()|encodeJS}', '{$container->getWysiwygId()|encodeJS}');
13+
new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getWysiwygId()|encodeJS}');
1414
});
1515
</script>

0 commit comments

Comments
 (0)