From babdc1e38f9991fc65145585b178750783b65f5e Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 24 Feb 2019 14:37:42 +0100
Subject: [PATCH] Fix separator of multiple form CSS classes

See #2509
---
 com.woltlab.wcf/templates/__dialogForm.tpl                 | 2 +-
 com.woltlab.wcf/templates/__form.tpl                       | 2 +-
 com.woltlab.wcf/templates/__formFieldHeader.tpl            | 2 +-
 wcfsetup/install/files/acp/templates/__dialogForm.tpl      | 2 +-
 wcfsetup/install/files/acp/templates/__form.tpl            | 2 +-
 wcfsetup/install/files/acp/templates/__formFieldHeader.tpl | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/com.woltlab.wcf/templates/__dialogForm.tpl b/com.woltlab.wcf/templates/__dialogForm.tpl
index a9e70ba54e..d42513b72f 100644
--- a/com.woltlab.wcf/templates/__dialogForm.tpl
+++ b/com.woltlab.wcf/templates/__dialogForm.tpl
@@ -13,7 +13,7 @@
 	{assign var='__formEnd' value='</section>'}
 {/if}
 
-{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
 	{foreach from=$form item='child'}
 		{if $child->isAvailable()}
 			{@$child->getHtml()}
diff --git a/com.woltlab.wcf/templates/__form.tpl b/com.woltlab.wcf/templates/__form.tpl
index 5f50ac22b6..dff9c392ce 100644
--- a/com.woltlab.wcf/templates/__form.tpl
+++ b/com.woltlab.wcf/templates/__form.tpl
@@ -5,7 +5,7 @@
 	});
 </script>
 
-<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
 	{foreach from=$form item='child'}
 		{if $child->isAvailable()}
 			{@$child->getHtml()}
diff --git a/com.woltlab.wcf/templates/__formFieldHeader.tpl b/com.woltlab.wcf/templates/__formFieldHeader.tpl
index cc3438f97c..865a321952 100644
--- a/com.woltlab.wcf/templates/__formFieldHeader.tpl
+++ b/com.woltlab.wcf/templates/__formFieldHeader.tpl
@@ -1,3 +1,3 @@
-<dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
 	<dt><label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label></dt>
+<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}>
 	<dd>
diff --git a/wcfsetup/install/files/acp/templates/__dialogForm.tpl b/wcfsetup/install/files/acp/templates/__dialogForm.tpl
index a9e70ba54e..d42513b72f 100644
--- a/wcfsetup/install/files/acp/templates/__dialogForm.tpl
+++ b/wcfsetup/install/files/acp/templates/__dialogForm.tpl
@@ -13,7 +13,7 @@
 	{assign var='__formEnd' value='</section>'}
 {/if}
 
-{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
 	{foreach from=$form item='child'}
 		{if $child->isAvailable()}
 			{@$child->getHtml()}
diff --git a/wcfsetup/install/files/acp/templates/__form.tpl b/wcfsetup/install/files/acp/templates/__form.tpl
index 5f50ac22b6..dff9c392ce 100644
--- a/wcfsetup/install/files/acp/templates/__form.tpl
+++ b/wcfsetup/install/files/acp/templates/__form.tpl
@@ -5,7 +5,7 @@
 	});
 </script>
 
-<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
 	{foreach from=$form item='child'}
 		{if $child->isAvailable()}
 			{@$child->getHtml()}
diff --git a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl b/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
index cc3438f97c..865a321952 100644
--- a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
@@ -1,3 +1,3 @@
-<dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
 	<dt><label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label></dt>
+<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}>
 	<dd>
-- 
2.20.1