Add missing nesting in output of non-filterable multiple selection form field

See #2509

diff --git a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
index 8920cbb2e37e80635fb20f5c41915948d2f2f1e4..e9bf9fef66868f660606eba44083dd77e1743906 100644 (file)
--- a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
@@ -31,7 +31,16 @@
                {/foreach}
        </ul>
 {else}
-       {htmlCheckboxes options=$field->getOptions() name=$field->getPrefixedId() selected=$field->getValue() disabled=$field->isImmutable() disableEncoding=true}
+       {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
+               <label{if $__fieldNestedOption[depth] > 0} style="margin-left: {$__fieldNestedOption[depth]*20}px"{/if}>
+                       <input type="checkbox" {*
+                               *}name="{@$field->getPrefixedId()}[]" {*
+                               *}value="{$__fieldNestedOption[value]}"{*
+                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue()} checked{/if}{*
+                               *}{if $field->isImmutable()} disabled{/if}{*
+                       *}> {@$__fieldNestedOption[label]}
+               </label>
+       {/foreach}
 {/if}
 
 {include file='__formFieldFooter'}

diff --git a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
index 8920cbb2e37e80635fb20f5c41915948d2f2f1e4..e9bf9fef66868f660606eba44083dd77e1743906 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
@@ -31,7 +31,16 @@
                {/foreach}
        </ul>
 {else}
-       {htmlCheckboxes options=$field->getOptions() name=$field->getPrefixedId() selected=$field->getValue() disabled=$field->isImmutable() disableEncoding=true}
+       {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
+               <label{if $__fieldNestedOption[depth] > 0} style="margin-left: {$__fieldNestedOption[depth]*20}px"{/if}>
+                       <input type="checkbox" {*
+                               *}name="{@$field->getPrefixedId()}[]" {*
+                               *}value="{$__fieldNestedOption[value]}"{*
+                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue()} checked{/if}{*
+                               *}{if $field->isImmutable()} disabled{/if}{*
+                       *}> {@$__fieldNestedOption[label]}
+               </label>
+       {/foreach}
 {/if}
 
 {include file='__formFieldFooter'}