Merge branch 'refs/heads/6.0'

# Conflicts:
#	com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl
#	com.woltlab.wcf/templates/commentEditor.tpl
#	com.woltlab.wcf/templates/commentResponseEditor.tpl
#	ts/WoltLabSuite/Core/Component/Comment/Add.ts
#	wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl
#	wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js

diff --cc com.woltlab.wcf/templates/commentEditor.tpl
index e88a0dc3f81a326b0cc1e4c496bb06ce3450d4b2,cd031b7b15d8ff80427bb3fddc280ce6087df291..6f8ea56ff719c89a1ff2cf625b2081397306f780
--- 1/com.woltlab.wcf/templates/commentEditor.tpl
--- 2/com.woltlab.wcf/templates/commentEditor.tpl
+++ b/com.woltlab.wcf/templates/commentEditor.tpl
@@@ -2,8 -2,8 +2,8 @@@
  <textarea id="{$wysiwygSelector}" class="wysiwygTextarea"
            data-disable-attachments="true"
            data-support-mention="true"
 ->{$comment->message}</textarea>
 +>{$text}</textarea>
- {include file='messageFormTabsInline'}
+ {include file='messageFormTabsInline' wysiwygContainerID=$wysiwygSelector wysiwygSelector=$wysiwygSelector}
  
  <div class="formSubmit">
        <button type="button" class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
@@@ -13,4 -13,10 +13,10 @@@
        <button type="button" class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
  </div>
  
 -{include file='wysiwyg' wysiwygSelector=$wysiwygSelector}
+ <script data-relocate="true">
+       require(['WoltLabSuite/Core/Component/Comment/Add'], ({ setCommentEditorFeatures }) => {
+               setCommentEditorFeatures(document.getElementById('{$wysiwygSelector}'));
+       });
+ </script>
+ 
 +{include file='shared_wysiwyg' wysiwygSelector=$wysiwygSelector}

diff --cc com.woltlab.wcf/templates/commentResponseEditor.tpl
index 182b7a509a457ebc0b9d357a38cd4830f2454e7f,732b971e4d44f936950958cef5b5742d3b8815f2..38e0886e0dd3d203c4fd9019ab4d08f758f01c54
--- 1/com.woltlab.wcf/templates/commentResponseEditor.tpl
--- 2/com.woltlab.wcf/templates/commentResponseEditor.tpl
+++ b/com.woltlab.wcf/templates/commentResponseEditor.tpl
@@@ -2,8 -2,8 +2,8 @@@
  <textarea id="{$wysiwygSelector}" class="wysiwygTextarea"
            data-disable-attachments="true"
            data-support-mention="true"
 ->{$response->message}</textarea>
 +>{$text}</textarea>
- {include file='messageFormTabsInline'}
+ {include file='messageFormTabsInline' wysiwygContainerID=$wysiwygSelector wysiwygSelector=$wysiwygSelector}
  
  <div class="formSubmit">
        <button type="button" class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
@@@ -13,4 -13,10 +13,10 @@@
        <button type="button" class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
  </div>
  
 -{include file='wysiwyg' wysiwygSelector=$wysiwygSelector}
+ <script data-relocate="true">
+       require(['WoltLabSuite/Core/Component/Comment/Add'], ({ setCommentEditorFeatures }) => {
+               setCommentEditorFeatures(document.getElementById('{$wysiwygSelector}'));
+       });
+ </script>
+ 
 +{include file='shared_wysiwyg' wysiwygSelector=$wysiwygSelector}

diff --cc ts/WoltLabSuite/Core/Component/Comment/Add.ts
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js
index b64c0063a21960de2fa2755ad8444aca04189e2c,5f6867540ebca3eba9581ae86313e85776887968..9c402740d0ad5bf535a9e02b0ff8f754ab4eb3ef
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js
@@@ -6,10 -6,10 +6,10 @@@
   * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
   * @since 6.0
   */
 -define(["require", "exports", "tslib", "../../Ajax", "../../Ui/Scroll", "../../Ui/Notification", "../../Language", "../../Event/Handler", "../../Dom/Util", "./GuestDialog", "../../Core", "../Ckeditor", "../Ckeditor/Event"], function (require, exports, tslib_1, Ajax_1, UiScroll, UiNotification, Language_1, EventHandler, Util_1, GuestDialog_1, Core, Ckeditor_1, Event_1) {
 +define(["require", "exports", "tslib", "../../Ui/Scroll", "../../Ui/Notification", "../../Language", "../../Event/Handler", "../../Dom/Util", "../Ckeditor", "../Ckeditor/Event", "WoltLabSuite/Core/Api/Comments/CreateComment", "../GuestTokenDialog", "WoltLabSuite/Core/User"], function (require, exports, tslib_1, UiScroll, UiNotification, Language_1, EventHandler, Util_1, Ckeditor_1, Event_1, CreateComment_1, GuestTokenDialog_1, User_1) {
      "use strict";
      Object.defineProperty(exports, "__esModule", { value: true });
-     exports.CommentAdd = void 0;
+     exports.setCommentEditorFeatures = exports.CommentAdd = void 0;
      UiScroll = tslib_1.__importStar(UiScroll);
      UiNotification = tslib_1.__importStar(UiNotification);
      EventHandler = tslib_1.__importStar(EventHandler);

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Media/Clipboard.js
index b7d88cfe49c1117738d9c4d67968cc0282bc538c,2cc8b9e18fe32b34d746267daf4228b144f09849..9949112eccc5bd5f42c11aef39564a9734efc224
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Clipboard.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Clipboard.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Clipboard.js
@@@ -6,16 -6,13 +6,14 @@@
   * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
   * @woltlabExcludeBundle tiny
   */
- define(["require", "exports", "tslib", "../Controller/Clipboard", "../Ui/Notification", "../Ui/Dialog", "../Event/Handler", "../Language", "../Ajax"], function (require, exports, tslib_1, Clipboard, UiNotification, UiDialog, EventHandler, Language, Ajax) {
+ define(["require", "exports", "tslib", "../Controller/Clipboard", "../Ui/Notification", "../Event/Handler", "../Language", "../Ajax", "WoltLabSuite/Core/Component/Dialog"], function (require, exports, tslib_1, Clipboard, UiNotification, EventHandler, Language_1, Ajax, Dialog_1) {
      "use strict";
      Object.defineProperty(exports, "__esModule", { value: true });
 -    exports.setMediaManager = exports.init = void 0;
 +    exports.init = init;
 +    exports.setMediaManager = setMediaManager;
      Clipboard = tslib_1.__importStar(Clipboard);
      UiNotification = tslib_1.__importStar(UiNotification);
-     UiDialog = tslib_1.__importStar(UiDialog);
      EventHandler = tslib_1.__importStar(EventHandler);
-     Language = tslib_1.__importStar(Language);
      Ajax = tslib_1.__importStar(Ajax);
      let _mediaManager;
      let _didInit = false;