From e9154428f7f114cf29d20cf5746914f14e58e9d2 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 5 Oct 2019 16:35:36 +0200
Subject: [PATCH] Add IFormField::getFieldHtml()

Close #3085
---
 com.woltlab.wcf/templates/__aclFormField.tpl  |  4 ----
 .../templates/__booleanFormField.tpl          |  4 ----
 .../templates/__contentLanguageFormField.tpl  |  4 ----
 com.woltlab.wcf/templates/__dateFormField.tpl |  4 ----
 .../templates/__emailFormField.tpl            |  4 ----
 ...{__formFieldHeader.tpl => __formField.tpl} |  8 ++++++++
 .../templates/__formFieldFooter.tpl           |  6 ------
 com.woltlab.wcf/templates/__iconFormField.tpl |  4 ----
 .../templates/__itemListFormField.tpl         |  4 ----
 .../templates/__labelFormField.tpl            |  4 ----
 .../templates/__multilineTextFormField.tpl    |  4 ----
 .../__multipleSelectionFormField.tpl          |  4 ----
 .../templates/__numericFormField.tpl          |  4 ----
 .../templates/__pollOptionsFormField.tpl      |  4 ----
 .../templates/__radioButtonFormField.tpl      |  4 ----
 .../templates/__ratingFormField.tpl           |  4 ----
 .../__singleMediaSelectionFormField.tpl       |  4 ----
 .../templates/__singleSelectionFormField.tpl  |  4 ----
 com.woltlab.wcf/templates/__tagFormField.tpl  |  4 ----
 com.woltlab.wcf/templates/__textFormField.tpl |  4 ----
 .../templates/__uploadFormField.tpl           |  4 ----
 com.woltlab.wcf/templates/__userFormField.tpl |  4 ----
 .../templates/__usernameFormField.tpl         |  4 ----
 .../__wysiwygAttachmentFormField.tpl          |  4 ----
 .../templates/__wysiwygFormField.tpl          |  4 ----
 .../files/acp/templates/__aclFormField.tpl    |  4 ----
 .../acp/templates/__booleanFormField.tpl      |  4 ----
 .../templates/__contentLanguageFormField.tpl  |  4 ----
 .../files/acp/templates/__dateFormField.tpl   |  4 ----
 .../files/acp/templates/__emailFormField.tpl  |  4 ----
 ...{__formFieldHeader.tpl => __formField.tpl} |  8 ++++++++
 .../files/acp/templates/__formFieldFooter.tpl |  6 ------
 .../files/acp/templates/__iconFormField.tpl   |  4 ----
 .../acp/templates/__itemListFormField.tpl     |  4 ----
 .../files/acp/templates/__labelFormField.tpl  |  4 ----
 .../templates/__multilineTextFormField.tpl    |  4 ----
 .../__multipleSelectionFormField.tpl          |  4 ----
 .../acp/templates/__numericFormField.tpl      |  4 ----
 .../acp/templates/__pollOptionsFormField.tpl  |  4 ----
 .../acp/templates/__radioButtonFormField.tpl  |  4 ----
 .../files/acp/templates/__ratingFormField.tpl |  4 ----
 .../__singleMediaSelectionFormField.tpl       |  4 ----
 .../templates/__singleSelectionFormField.tpl  |  4 ----
 .../files/acp/templates/__tagFormField.tpl    |  4 ----
 .../files/acp/templates/__textFormField.tpl   |  4 ----
 .../files/acp/templates/__uploadFormField.tpl |  4 ----
 .../files/acp/templates/__userFormField.tpl   |  4 ----
 .../acp/templates/__usernameFormField.tpl     |  4 ----
 .../__wysiwygAttachmentFormField.tpl          |  4 ----
 .../acp/templates/__wysiwygFormField.tpl      |  4 ----
 .../builder/field/AbstractFormField.class.php | 19 +++++++++++++++++--
 .../form/builder/field/IFormField.class.php   |  8 ++++++++
 .../builder/field/UploadFormField.class.php   | 12 ++++++++++++
 .../field/wysiwyg/WysiwygFormField.class.php  |  4 ++--
 54 files changed, 55 insertions(+), 200 deletions(-)
 rename com.woltlab.wcf/templates/{__formFieldHeader.tpl => __formField.tpl} (69%)
 delete mode 100644 com.woltlab.wcf/templates/__formFieldFooter.tpl
 rename wcfsetup/install/files/acp/templates/{__formFieldHeader.tpl => __formField.tpl} (69%)
 delete mode 100644 wcfsetup/install/files/acp/templates/__formFieldFooter.tpl

diff --git a/com.woltlab.wcf/templates/__aclFormField.tpl b/com.woltlab.wcf/templates/__aclFormField.tpl
index 16b053dcbc..033074374b 100644
--- a/com.woltlab.wcf/templates/__aclFormField.tpl
+++ b/com.woltlab.wcf/templates/__aclFormField.tpl
@@ -1,9 +1,5 @@
-{include file='__formFieldHeader'}
-
 {if $includeAclJavaScript}
 	{include file='aclPermissions'}
 {/if}
 
 {include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__booleanFormField.tpl b/com.woltlab.wcf/templates/__booleanFormField.tpl
index da10fb6550..af28e8e821 100644
--- a/com.woltlab.wcf/templates/__booleanFormField.tpl
+++ b/com.woltlab.wcf/templates/__booleanFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ol class="flexibleButtonGroup">
 	<li>
 		<input type="radio" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" value="1" data-no-input-id="{@$field->getPrefixedId()}_no"{if $field->isAutofocused()} autofocus{/if}{if $field->isRequired()} required{/if}{if $field->isImmutable()} disabled{/if}{if $field->getValue()} checked{/if}>
@@ -10,5 +8,3 @@
 		<label for="{@$field->getPrefixedId()}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}</label>
 	</li>
 </ol>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__contentLanguageFormField.tpl b/com.woltlab.wcf/templates/__contentLanguageFormField.tpl
index f26a83a1a2..ff0b8e3db7 100644
--- a/com.woltlab.wcf/templates/__contentLanguageFormField.tpl
+++ b/com.woltlab.wcf/templates/__contentLanguageFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <noscript>
 	<select name="{@$field->getPrefixedId()}" id="{@$field->getPrefixedId()}"{if $field->isImmutable()} disabled{/if}>
 		{if !$field->isRequired()}
@@ -32,5 +30,3 @@
 		)
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__dateFormField.tpl b/com.woltlab.wcf/templates/__dateFormField.tpl
index 3fe9d8d6be..c5a4218ad0 100644
--- a/com.woltlab.wcf/templates/__dateFormField.tpl
+++ b/com.woltlab.wcf/templates/__dateFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input {*
 	*}type="{if $field->supportsTime()}datetime{else}date{/if}" {*
 	*}id="{@$field->getPrefixedId()}" {*
@@ -12,5 +10,3 @@
 	*}{if $field->getEarliestDate() !== null} min="{$dateFormFieldEarliestDate}"{/if}{*
 	*}{if $field->getLatestDate() !== null} max="{$dateFormFieldLatestDate}"{/if}{*
 *}>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__emailFormField.tpl b/com.woltlab.wcf/templates/__emailFormField.tpl
index 7f62e54a92..af84b97ea7 100644
--- a/com.woltlab.wcf/templates/__emailFormField.tpl
+++ b/com.woltlab.wcf/templates/__emailFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="email" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -16,5 +14,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__formFieldHeader.tpl b/com.woltlab.wcf/templates/__formField.tpl
similarity index 69%
rename from com.woltlab.wcf/templates/__formFieldHeader.tpl
rename to com.woltlab.wcf/templates/__formField.tpl
index 41def24519..d726d5aa69 100644
--- a/com.woltlab.wcf/templates/__formFieldHeader.tpl
+++ b/com.woltlab.wcf/templates/__formField.tpl
@@ -1,3 +1,11 @@
 <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>
 	<dd>
+		{@$field->getFieldHtml()}
+		
+		{include file='__formFieldDescription'}
+		{include file='__formFieldErrors'}
+		{include file='__formFieldDependencies'}
+		{include file='__formFieldDataHandler'}
+	</dd>
+</dl>
diff --git a/com.woltlab.wcf/templates/__formFieldFooter.tpl b/com.woltlab.wcf/templates/__formFieldFooter.tpl
deleted file mode 100644
index f420d74d3d..0000000000
--- a/com.woltlab.wcf/templates/__formFieldFooter.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-		{include file='__formFieldDescription'}
-		{include file='__formFieldErrors'}
-		{include file='__formFieldDependencies'}
-		{include file='__formFieldDataHandler'}
-	</dd>
-</dl>
diff --git a/com.woltlab.wcf/templates/__iconFormField.tpl b/com.woltlab.wcf/templates/__iconFormField.tpl
index b8c8d2535d..620cf56812 100644
--- a/com.woltlab.wcf/templates/__iconFormField.tpl
+++ b/com.woltlab.wcf/templates/__iconFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <span{if $field->getValue()} class="icon icon64 fa-{$field->getValue()}"{/if} id="{@$field->getPrefixedId()}_icon"></span>
 {if !$field->isImmutable()}
 	<a href="#" class="button small" id="{@$field->getPrefixedId()}_openIconDialog">{lang}wcf.global.button.edit{/lang}</a>
@@ -30,5 +28,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__itemListFormField.tpl b/com.woltlab.wcf/templates/__itemListFormField.tpl
index 7c43cc017a..eb512c2779 100644
--- a/com.woltlab.wcf/templates/__itemListFormField.tpl
+++ b/com.woltlab.wcf/templates/__itemListFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" class="long"{if $field->isAutofocused()} autofocus{/if}{if $field->isImmutable()} disabled{/if}>
 
 <script data-relocate="true">
@@ -14,5 +12,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__labelFormField.tpl b/com.woltlab.wcf/templates/__labelFormField.tpl
index 13068c1c5a..90bde6516f 100644
--- a/com.woltlab.wcf/templates/__labelFormField.tpl
+++ b/com.woltlab.wcf/templates/__labelFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul class="labelList jsOnly" data-object-id="{@$field->getLabelGroup()->groupID}">
 	<li class="dropdown labelChooser" data-group-id="{@$field->getLabelGroup()->groupID}">
 		<div class="dropdownToggle" data-toggle="labelGroup{@$field->getLabelGroup()->groupID}">
@@ -41,5 +39,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__multilineTextFormField.tpl b/com.woltlab.wcf/templates/__multilineTextFormField.tpl
index 87f4ea3151..dfd907b640 100644
--- a/com.woltlab.wcf/templates/__multilineTextFormField.tpl
+++ b/com.woltlab.wcf/templates/__multilineTextFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <textarea id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
 	*}rows="{@$field->getRows()}"{*
@@ -14,5 +12,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
index f6afdf6be3..81e6cdcc7d 100644
--- a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isFilterable()}
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
@@ -42,5 +40,3 @@
 		</label>
 	{/foreach}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__numericFormField.tpl b/com.woltlab.wcf/templates/__numericFormField.tpl
index 0cf95031b3..88c20257df 100644
--- a/com.woltlab.wcf/templates/__numericFormField.tpl
+++ b/com.woltlab.wcf/templates/__numericFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->getSuffix() !== null}
 	<div class="inputAddon">
 {/if}
@@ -23,5 +21,3 @@
 		<span class="inputSuffix">{@$field->getSuffix()}</span>
 	</div>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
index 218c479c99..290b083de0 100644
--- a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
@@ -1,9 +1,5 @@
-{include file='__formFieldHeader'}
-
 <ol class="sortableList"></ol>
 
-{include file='__formFieldFooter'}
-
 <script data-relocate="true">
 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
 		Language.addObject({
diff --git a/com.woltlab.wcf/templates/__radioButtonFormField.tpl b/com.woltlab.wcf/templates/__radioButtonFormField.tpl
index 1fb80cba9d..6080d1d43d 100644
--- a/com.woltlab.wcf/templates/__radioButtonFormField.tpl
+++ b/com.woltlab.wcf/templates/__radioButtonFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {foreach from=$field->getOptions() key=$__fieldValue item=__fieldLabel}
 	<label>
 		<input {*
@@ -11,5 +9,3 @@
 		*}> {@$__fieldLabel}
 	</label>
 {/foreach}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__ratingFormField.tpl b/com.woltlab.wcf/templates/__ratingFormField.tpl
index d1d8ded8e7..cbf631a560 100644
--- a/com.woltlab.wcf/templates/__ratingFormField.tpl
+++ b/com.woltlab.wcf/templates/__ratingFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul class="ratingList jsOnly">
 	{foreach from=$field->getRatings() item=rating}
 		<li data-rating="{@$rating}"><span class="icon icon24 {if $rating <= $field->getValue()}{implode from=$field->getActiveCssClasses() item=cssClass glue=' '}{@$cssClass}{/implode}{else}{implode from=$field->getDefaultCssClasses() item=cssClass glue=' '}{@$cssClass}{/implode}{/if} pointer jsTooltip" title="{lang maximumRating=$field->getMaximum()}wcf.form.field.rating.ratingTitle{/lang}"></span></li>
@@ -26,5 +24,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl b/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl
index e48f0a0052..6b9869638d 100644
--- a/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isImmutable() && $field->getValue()}
 	{if $field->getMedia()->isImage && $field->getMedia()->hasThumbnail('small')}
 		<div id="{@$field->getPrefixedId()}_preview" class="selectedImagePreview">
@@ -37,5 +35,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__singleSelectionFormField.tpl b/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
index 12be157cc9..c3209915a6 100644
--- a/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isFilterable()}
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
@@ -42,5 +40,3 @@
 		{/foreach}
 	</select>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__tagFormField.tpl b/com.woltlab.wcf/templates/__tagFormField.tpl
index 1b0f6c7a35..09d380ab4d 100644
--- a/com.woltlab.wcf/templates/__tagFormField.tpl
+++ b/com.woltlab.wcf/templates/__tagFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input id="{@$field->getPrefixedId()}" type="text" value="" class="long">
 
 <script data-relocate="true">
@@ -17,5 +15,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__textFormField.tpl b/com.woltlab.wcf/templates/__textFormField.tpl
index ec09c659d1..44a3cda275 100644
--- a/com.woltlab.wcf/templates/__textFormField.tpl
+++ b/com.woltlab.wcf/templates/__textFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -17,5 +15,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__uploadFormField.tpl b/com.woltlab.wcf/templates/__uploadFormField.tpl
index 83bcc45a13..b03d8df216 100644
--- a/com.woltlab.wcf/templates/__uploadFormField.tpl
+++ b/com.woltlab.wcf/templates/__uploadFormField.tpl
@@ -1,5 +1 @@
-{include file='__formFieldHeader'}
-
 {@$__wcf->getUploadHandler()->renderField($field->getPrefixedId())}
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__userFormField.tpl b/com.woltlab.wcf/templates/__userFormField.tpl
index 8247c9425b..9b4aa2ee4f 100644
--- a/com.woltlab.wcf/templates/__userFormField.tpl
+++ b/com.woltlab.wcf/templates/__userFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -18,5 +16,3 @@
 		});
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__usernameFormField.tpl b/com.woltlab.wcf/templates/__usernameFormField.tpl
index a857c80246..4df1dfda16 100644
--- a/com.woltlab.wcf/templates/__usernameFormField.tpl
+++ b/com.woltlab.wcf/templates/__usernameFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -13,5 +11,3 @@
 	*}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{*
 	*}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{*
 *}>
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index 0b434700f6..03a1f583e2 100644
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul id="{@$field->getPrefixedID()}_attachmentList" {*
 	*}class="formAttachmentList"{*
 	*}{if !$field->getAttachmentHandler()->getAttachmentList()|count} style="display: none"{/if} {*
@@ -72,5 +70,3 @@
 </script>
 
 <input type="hidden" id="{@$field->getPrefixedID()}_tmpHash" name="{@$field->getPrefixedID()}_tmpHash" value="{$field->getAttachmentHandler()->getTmpHashes()[0]}">
-
-{include file='__formFieldFooter'}
diff --git a/com.woltlab.wcf/templates/__wysiwygFormField.tpl b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
index 4be47d0812..0f53638aa1 100644
--- a/com.woltlab.wcf/templates/__wysiwygFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <textarea {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -38,5 +36,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__aclFormField.tpl b/wcfsetup/install/files/acp/templates/__aclFormField.tpl
index 16b053dcbc..033074374b 100644
--- a/wcfsetup/install/files/acp/templates/__aclFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__aclFormField.tpl
@@ -1,9 +1,5 @@
-{include file='__formFieldHeader'}
-
 {if $includeAclJavaScript}
 	{include file='aclPermissions'}
 {/if}
 
 {include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__booleanFormField.tpl b/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
index da10fb6550..af28e8e821 100644
--- a/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__booleanFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ol class="flexibleButtonGroup">
 	<li>
 		<input type="radio" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" value="1" data-no-input-id="{@$field->getPrefixedId()}_no"{if $field->isAutofocused()} autofocus{/if}{if $field->isRequired()} required{/if}{if $field->isImmutable()} disabled{/if}{if $field->getValue()} checked{/if}>
@@ -10,5 +8,3 @@
 		<label for="{@$field->getPrefixedId()}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}</label>
 	</li>
 </ol>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__contentLanguageFormField.tpl b/wcfsetup/install/files/acp/templates/__contentLanguageFormField.tpl
index f26a83a1a2..ff0b8e3db7 100644
--- a/wcfsetup/install/files/acp/templates/__contentLanguageFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__contentLanguageFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <noscript>
 	<select name="{@$field->getPrefixedId()}" id="{@$field->getPrefixedId()}"{if $field->isImmutable()} disabled{/if}>
 		{if !$field->isRequired()}
@@ -32,5 +30,3 @@
 		)
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__dateFormField.tpl b/wcfsetup/install/files/acp/templates/__dateFormField.tpl
index 3fe9d8d6be..c5a4218ad0 100644
--- a/wcfsetup/install/files/acp/templates/__dateFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__dateFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input {*
 	*}type="{if $field->supportsTime()}datetime{else}date{/if}" {*
 	*}id="{@$field->getPrefixedId()}" {*
@@ -12,5 +10,3 @@
 	*}{if $field->getEarliestDate() !== null} min="{$dateFormFieldEarliestDate}"{/if}{*
 	*}{if $field->getLatestDate() !== null} max="{$dateFormFieldLatestDate}"{/if}{*
 *}>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__emailFormField.tpl b/wcfsetup/install/files/acp/templates/__emailFormField.tpl
index 7f62e54a92..af84b97ea7 100644
--- a/wcfsetup/install/files/acp/templates/__emailFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__emailFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="email" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -16,5 +14,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl b/wcfsetup/install/files/acp/templates/__formField.tpl
similarity index 69%
rename from wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
rename to wcfsetup/install/files/acp/templates/__formField.tpl
index 41def24519..d726d5aa69 100644
--- a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/__formField.tpl
@@ -1,3 +1,11 @@
 <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>
 	<dd>
+		{@$field->getFieldHtml()}
+		
+		{include file='__formFieldDescription'}
+		{include file='__formFieldErrors'}
+		{include file='__formFieldDependencies'}
+		{include file='__formFieldDataHandler'}
+	</dd>
+</dl>
diff --git a/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl b/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl
deleted file mode 100644
index f420d74d3d..0000000000
--- a/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-		{include file='__formFieldDescription'}
-		{include file='__formFieldErrors'}
-		{include file='__formFieldDependencies'}
-		{include file='__formFieldDataHandler'}
-	</dd>
-</dl>
diff --git a/wcfsetup/install/files/acp/templates/__iconFormField.tpl b/wcfsetup/install/files/acp/templates/__iconFormField.tpl
index b8c8d2535d..620cf56812 100644
--- a/wcfsetup/install/files/acp/templates/__iconFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__iconFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <span{if $field->getValue()} class="icon icon64 fa-{$field->getValue()}"{/if} id="{@$field->getPrefixedId()}_icon"></span>
 {if !$field->isImmutable()}
 	<a href="#" class="button small" id="{@$field->getPrefixedId()}_openIconDialog">{lang}wcf.global.button.edit{/lang}</a>
@@ -30,5 +28,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__itemListFormField.tpl b/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
index 7c43cc017a..eb512c2779 100644
--- a/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" class="long"{if $field->isAutofocused()} autofocus{/if}{if $field->isImmutable()} disabled{/if}>
 
 <script data-relocate="true">
@@ -14,5 +12,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__labelFormField.tpl b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
index 13068c1c5a..90bde6516f 100644
--- a/wcfsetup/install/files/acp/templates/__labelFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul class="labelList jsOnly" data-object-id="{@$field->getLabelGroup()->groupID}">
 	<li class="dropdown labelChooser" data-group-id="{@$field->getLabelGroup()->groupID}">
 		<div class="dropdownToggle" data-toggle="labelGroup{@$field->getLabelGroup()->groupID}">
@@ -41,5 +39,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__multilineTextFormField.tpl b/wcfsetup/install/files/acp/templates/__multilineTextFormField.tpl
index 87f4ea3151..dfd907b640 100644
--- a/wcfsetup/install/files/acp/templates/__multilineTextFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__multilineTextFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <textarea id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
 	*}rows="{@$field->getRows()}"{*
@@ -14,5 +12,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
index f6afdf6be3..81e6cdcc7d 100644
--- a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isFilterable()}
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
@@ -42,5 +40,3 @@
 		</label>
 	{/foreach}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__numericFormField.tpl b/wcfsetup/install/files/acp/templates/__numericFormField.tpl
index 0cf95031b3..88c20257df 100644
--- a/wcfsetup/install/files/acp/templates/__numericFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__numericFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->getSuffix() !== null}
 	<div class="inputAddon">
 {/if}
@@ -23,5 +21,3 @@
 		<span class="inputSuffix">{@$field->getSuffix()}</span>
 	</div>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
index 218c479c99..290b083de0 100644
--- a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
@@ -1,9 +1,5 @@
-{include file='__formFieldHeader'}
-
 <ol class="sortableList"></ol>
 
-{include file='__formFieldFooter'}
-
 <script data-relocate="true">
 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
 		Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/__radioButtonFormField.tpl b/wcfsetup/install/files/acp/templates/__radioButtonFormField.tpl
index 1fb80cba9d..6080d1d43d 100644
--- a/wcfsetup/install/files/acp/templates/__radioButtonFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__radioButtonFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {foreach from=$field->getOptions() key=$__fieldValue item=__fieldLabel}
 	<label>
 		<input {*
@@ -11,5 +9,3 @@
 		*}> {@$__fieldLabel}
 	</label>
 {/foreach}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__ratingFormField.tpl b/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
index d1d8ded8e7..cbf631a560 100644
--- a/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul class="ratingList jsOnly">
 	{foreach from=$field->getRatings() item=rating}
 		<li data-rating="{@$rating}"><span class="icon icon24 {if $rating <= $field->getValue()}{implode from=$field->getActiveCssClasses() item=cssClass glue=' '}{@$cssClass}{/implode}{else}{implode from=$field->getDefaultCssClasses() item=cssClass glue=' '}{@$cssClass}{/implode}{/if} pointer jsTooltip" title="{lang maximumRating=$field->getMaximum()}wcf.form.field.rating.ratingTitle{/lang}"></span></li>
@@ -26,5 +24,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl
index e48f0a0052..6b9869638d 100644
--- a/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isImmutable() && $field->getValue()}
 	{if $field->getMedia()->isImage && $field->getMedia()->hasThumbnail('small')}
 		<div id="{@$field->getPrefixedId()}_preview" class="selectedImagePreview">
@@ -37,5 +35,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
index 12be157cc9..c3209915a6 100644
--- a/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 {if $field->isFilterable()}
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
@@ -42,5 +40,3 @@
 		{/foreach}
 	</select>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__tagFormField.tpl b/wcfsetup/install/files/acp/templates/__tagFormField.tpl
index 1b0f6c7a35..09d380ab4d 100644
--- a/wcfsetup/install/files/acp/templates/__tagFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__tagFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input id="{@$field->getPrefixedId()}" type="text" value="" class="long">
 
 <script data-relocate="true">
@@ -17,5 +15,3 @@
 		);
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__textFormField.tpl b/wcfsetup/install/files/acp/templates/__textFormField.tpl
index ec09c659d1..44a3cda275 100644
--- a/wcfsetup/install/files/acp/templates/__textFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__textFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -17,5 +15,3 @@
 {if $field->isI18n()}
 	{include file='multipleLanguageInputJavascript'}
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__uploadFormField.tpl b/wcfsetup/install/files/acp/templates/__uploadFormField.tpl
index 83bcc45a13..b03d8df216 100644
--- a/wcfsetup/install/files/acp/templates/__uploadFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__uploadFormField.tpl
@@ -1,5 +1 @@
-{include file='__formFieldHeader'}
-
 {@$__wcf->getUploadHandler()->renderField($field->getPrefixedId())}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__userFormField.tpl b/wcfsetup/install/files/acp/templates/__userFormField.tpl
index 8247c9425b..9b4aa2ee4f 100644
--- a/wcfsetup/install/files/acp/templates/__userFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__userFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -18,5 +16,3 @@
 		});
 	});
 </script>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__usernameFormField.tpl b/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
index a857c80246..4df1dfda16 100644
--- a/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <input type="text" {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -13,5 +11,3 @@
 	*}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{*
 	*}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{*
 *}>
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index 0b434700f6..03a1f583e2 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <ul id="{@$field->getPrefixedID()}_attachmentList" {*
 	*}class="formAttachmentList"{*
 	*}{if !$field->getAttachmentHandler()->getAttachmentList()|count} style="display: none"{/if} {*
@@ -72,5 +70,3 @@
 </script>
 
 <input type="hidden" id="{@$field->getPrefixedID()}_tmpHash" name="{@$field->getPrefixedID()}_tmpHash" value="{$field->getAttachmentHandler()->getTmpHashes()[0]}">
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
index 4be47d0812..0f53638aa1 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
@@ -1,5 +1,3 @@
-{include file='__formFieldHeader'}
-
 <textarea {*
 	*}id="{@$field->getPrefixedId()}" {*
 	*}name="{@$field->getPrefixedId()}" {*
@@ -38,5 +36,3 @@
 		});
 	</script>
 {/if}
-
-{include file='__formFieldFooter'}
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
index 1f016034b5..3d546d088e 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
@@ -92,17 +92,32 @@ abstract class AbstractFormField implements IFormField {
 	/**
 	 * @inheritDoc
 	 */
-	public function getHtml() {
+	public function getFieldHtml() {
 		if ($this->templateName === null) {
 			throw new \LogicException("\$templateName property has not been set for class '" . static::class . "'.");
 		}
 		
+		return WCF::getTPL()->fetch(
+			$this->templateName,
+			'wcf',
+			array_merge($this->getHtmlVariables(), [
+				'field' => $this,
+				'javaScriptDataHandlerModule' => $this->javaScriptDataHandlerModule
+			]),
+			true
+		);
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function getHtml() {
 		if ($this->requiresLabel() && $this->getLabel() === null) {
 			throw new \UnexpectedValueException("Form field '{$this->getPrefixedId()}' requires a label.");
 		}
 		
 		return WCF::getTPL()->fetch(
-			$this->templateName,
+			'__formField',
 			'wcf',
 			array_merge($this->getHtmlVariables(), [
 				'field' => $this,
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
index 0521237759..f18122fa99 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
@@ -32,6 +32,14 @@ interface IFormField extends IFormChildNode, IFormElement {
 	 */
 	public function addValidator(IFormFieldValidator $validator);
 	
+	/**
+	 * Returns the html representation of the form field only without any of the surrounding
+	 * structural html elements.
+	 * 
+	 * @return	string		html representation of node
+	 */
+	public function getFieldHtml();
+	
 	/**
 	 * Returns the name of the object property this field represents.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
index d49101fcd0..2e725cc9e7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
@@ -261,6 +261,18 @@ class UploadFormField extends AbstractFormField {
 		return parent::getHtml();
 	}
 	
+	/**
+	 * @inheritDoc
+	 * @throws      \BadMethodCallException         if the method is called, before the field is populated
+	 */
+	public function getFieldHtml() {
+		if (!$this->isPopulated) {
+			throw new \BadMethodCallException("The field must be populated, before calling this method.");
+		}
+		
+		return parent::getFieldHtml();
+	}
+	
 	/**
 	 * @inheritDoc
 	 * 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
index 945f46136b..0b74a401ff 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
@@ -117,7 +117,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	/**
 	 * @inheritDoc
 	 */
-	public function getHtml() {
+	public function getFieldHtml() {
 		if ($this->supportsQuotes()) {
 			MessageQuoteManager::getInstance()->assignVariables();
 		}
@@ -133,7 +133,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 			WCF::getSession()->getPermission($disallowedBBCodesPermission)
 		));
 		
-		return parent::getHtml();
+		return parent::getFieldHtml();
 	}
 	
 	/**
-- 
2.20.1