Fix the detection of message tab menus

Fixes #5609

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
index 12add01a88480e371fbda77a8d3de094f72d9c31..16dbc95e311398733005abe1a7e04892f7384d8a 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
@@ -76,8 +76,10 @@ function setupRemoveAttachment(ckeditor: CKEditor): void {
 }
 
 function getInlineImageIds(element: HTMLElement): number[] {
-  const messageTabMenu = element.nextElementSibling;
-  if (!messageTabMenu || !messageTabMenu.classList.contains("messageTabMenu")) {
+  const messageTabMenu = document.querySelector<HTMLElement>(
+    `.messageTabMenu[data-wysiwyg-container-id="${element.id}"]`,
+  );
+  if (!messageTabMenu) {
     return [];
   }
 

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
index 689c48165c927a6f0310884ed42b65c6c9a85e17..d9d728f9c8946e0cdd764e060dd74733986442ed 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
@@ -42,8 +42,8 @@ define(["require", "exports", "./Event"], function (require, exports, Event_1) {
         });
     }
     function getInlineImageIds(element) {
-        const messageTabMenu = element.nextElementSibling;
-        if (!messageTabMenu || !messageTabMenu.classList.contains("messageTabMenu")) {
+        const messageTabMenu = document.querySelector(`.messageTabMenu[data-wysiwyg-container-id="${element.id}"]`);
+        if (!messageTabMenu) {
             return [];
         }
         const attachmentList = messageTabMenu.querySelector(".formAttachmentContent > .formAttachmentList");