From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 27 Dec 2020 13:12:50 +0000 (+0100)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.3.2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42aa139c1d19bedc62fc7532c454da35867ae92e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

42aa139c1d19bedc62fc7532c454da35867ae92e
diff --cc com.woltlab.wcf/templates/__formField.tpl
index d59c467b7d,752234e70e..0f752fcb9e
--- a/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 d59c467b7d,752234e70e..0f752fcb9e
--- a/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()}