Merge branch '5.2' into 5.3

diff --cc com.woltlab.wcf/templates/__formField.tpl
index d59c467b7d915a33579687c696fa057fa9ffdf5f,752234e70ef002a27e58a2983a466990c10298c6..0f752fcb9e3bc805eacf8c69028c18399ef0e14c
--- 1/com.woltlab.wcf/templates/__formField.tpl
--- 2/com.woltlab.wcf/templates/__formField.tpl
+++ b/com.woltlab.wcf/templates/__formField.tpl
@@@ -1,5 -1,9 +1,9 @@@
- <dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
+ <dl id="{@$field->getPrefixedId()}Container"{*
+       *}{if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+       *}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+       *}{if !$field->checkDependencies()} style="display: none;"{/if}{*
+ *}>
 -      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{/if}</dt>
 +      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
        <dd>
                {@$field->getFieldHtml()}
                

diff --cc wcfsetup/install/files/acp/templates/__formField.tpl
index d59c467b7d915a33579687c696fa057fa9ffdf5f,752234e70ef002a27e58a2983a466990c10298c6..0f752fcb9e3bc805eacf8c69028c18399ef0e14c
--- 1/wcfsetup/install/files/acp/templates/__formField.tpl
--- 2/wcfsetup/install/files/acp/templates/__formField.tpl
+++ b/wcfsetup/install/files/acp/templates/__formField.tpl
@@@ -1,5 -1,9 +1,9 @@@
- <dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
+ <dl id="{@$field->getPrefixedId()}Container"{*
+       *}{if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+       *}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+       *}{if !$field->checkDependencies()} style="display: none;"{/if}{*
+ *}>
 -      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{/if}</dt>
 +      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
        <dd>
                {@$field->getFieldHtml()}