Merge branch '6.2' into 6.3

Author: BurntimeX

com.woltlab.wcf/templates/shared_wysiwygQuoteFormContainer.tpl

@@ -3,14 +3,14 @@
 
 <script data-relocate="true">
 	require(["WoltLabSuite/Core/Component/Quote/List"], ({ setup }) => {
-		setup("{unsafe:$container->getWysiwygId()|encodeJS}", "{unsafe:$container->getPrefixedId()|encodeJS}Container");
+		setup("{unsafe:$container->getPrefixedWysiwygId()|encodeJS}", "{unsafe:$container->getPrefixedId()|encodeJS}Container");
 	});
 </script>
 
 {include file='shared_formContainerDependencies'}
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTab'], ({ WysiwygTab }) => {
-		new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getWysiwygId()|encodeJS}');
+		new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getPrefixedWysiwygId()|encodeJS}');
 	});
 </script>

com.woltlab.wcf/templates/shared_wysiwygTabFormContainer.tpl

@@ -10,6 +10,6 @@
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTab'], ({ WysiwygTab }) => {
-		new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getWysiwygId()|encodeJS}');
+		new WysiwygTab('{unsafe:$container->getPrefixedId()|encodeJS}Container', '{unsafe:$container->getName()|encodeJS}', '{unsafe:$container->getPrefixedWysiwygId()|encodeJS}');
 	});
 </script>

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php

@@ -498,7 +498,7 @@ public function populate()
             $this->wysiwygField,
             WysiwygTabMenuFormContainer::create($this->wysiwygId . 'Tabs')
                 ->attribute('data-preselect', $this->getPreselect())
-                ->attribute('data-wysiwyg-container-id', $this->wysiwygId)
+                ->attribute('data-wysiwyg-container-id', $this->getPrefixedWysiwygId())
                 ->useAnchors(false)
                 ->appendChildren([
                     $this->smiliesContainer,