From 5c09fb6319632630b2f405f5875677714fd66ba2 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 29 Sep 2019 16:26:44 +0200
Subject: [PATCH] Fix duplicate inclusion of `WCF.Combined` via AJAX form
 builder forms

---
 com.woltlab.wcf/templates/__labelFormField.tpl                | 1 -
 com.woltlab.wcf/templates/__pollOptionsFormField.tpl          | 1 -
 com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl    | 1 -
 com.woltlab.wcf/templates/__wysiwygFormField.tpl              | 1 -
 com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl   | 1 -
 wcfsetup/install/files/acp/templates/__labelFormField.tpl     | 1 -
 .../install/files/acp/templates/__pollOptionsFormField.tpl    | 1 -
 .../files/acp/templates/__wysiwygAttachmentFormField.tpl      | 1 -
 wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl   | 1 -
 .../files/acp/templates/__wysiwygTabMenuFormContainer.tpl     | 1 -
 wcfsetup/install/files/acp/templates/header.tpl               | 4 ++++
 11 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/templates/__labelFormField.tpl b/com.woltlab.wcf/templates/__labelFormField.tpl
index e683b7a9bc..13068c1c5a 100644
--- a/com.woltlab.wcf/templates/__labelFormField.tpl
+++ b/com.woltlab.wcf/templates/__labelFormField.tpl
@@ -25,7 +25,6 @@
 	</select>
 </noscript>
 
-{js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
 	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
diff --git a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
index b582ffde89..218c479c99 100644
--- a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
@@ -4,7 +4,6 @@
 
 {include file='__formFieldFooter'}
 
-{js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
 <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/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index 7061590169..0b434700f6 100644
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -41,7 +41,6 @@
 </ul>
 <div id="{@$field->getPrefixedID()}_uploadButton" class="formAttachmentButtons" data-max-size="{@$field->getAttachmentHandler()->getMaxSize()}"></div>
 
-{js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/__wysiwygFormField.tpl b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
index d53f7707fc..4be47d0812 100644
--- a/com.woltlab.wcf/templates/__wysiwygFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
@@ -17,7 +17,6 @@
 {include file='wysiwyg' wysiwygSelector=$field->getPrefixedId()}
 
 {if $field->supportsQuotes()}
-	{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 	<script data-relocate="true">
 		// Bootstrap for window.__wcf_bc_eventHandler
 		require(['WoltLabSuite/Core/Bootstrap'], function(Bootstrap) {
diff --git a/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl b/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
index 70cfabaed2..b42ab774da 100644
--- a/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
@@ -1,6 +1,5 @@
 {include file='__tabMenuFormContainer' __tabMenuCSSClassName='messageTabMenuNavigation'}
 
-{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 <script data-relocate="true">
 	$(function() {
 		$('#{@$container->getPrefixedId()}Container').messageTabMenu();
diff --git a/wcfsetup/install/files/acp/templates/__labelFormField.tpl b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
index e683b7a9bc..13068c1c5a 100644
--- a/wcfsetup/install/files/acp/templates/__labelFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
@@ -25,7 +25,6 @@
 	</select>
 </noscript>
 
-{js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
 	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
index b582ffde89..218c479c99 100644
--- a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
@@ -4,7 +4,6 @@
 
 {include file='__formFieldFooter'}
 
-{js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
 <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/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index 7061590169..0b434700f6 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -41,7 +41,6 @@
 </ul>
 <div id="{@$field->getPrefixedID()}_uploadButton" class="formAttachmentButtons" data-max-size="{@$field->getAttachmentHandler()->getMaxSize()}"></div>
 
-{js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
index d53f7707fc..4be47d0812 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
@@ -17,7 +17,6 @@
 {include file='wysiwyg' wysiwygSelector=$field->getPrefixedId()}
 
 {if $field->supportsQuotes()}
-	{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 	<script data-relocate="true">
 		// Bootstrap for window.__wcf_bc_eventHandler
 		require(['WoltLabSuite/Core/Bootstrap'], function(Bootstrap) {
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl b/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
index 70cfabaed2..b42ab774da 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
@@ -1,6 +1,5 @@
 {include file='__tabMenuFormContainer' __tabMenuCSSClassName='messageTabMenuNavigation'}
 
-{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 <script data-relocate="true">
 	$(function() {
 		$('#{@$container->getPrefixedId()}Container').messageTabMenu();
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 78670fdf11..a4297de8de 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -177,6 +177,10 @@
 		$.holdReady(true);
 		WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
 	</script>
+	{js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
+	{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
+	{js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
+	{js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
 	<script>
 		$(function() {
 			if (jQuery.browser.touch) $('html').addClass('touch');
-- 
2.20.1