Disabling images should not disable attachments and smilies

See https://www.woltlab.com/community/thread/300270-smiley-hinzuf%C3%BCgen-bei-woltlab-6-0/
See https://www.woltlab.com/community/thread/300284-einf%C3%BCgen-von-bildern-aus-der-zwischenablage-im-editor-nicht-m%C3%B6glich/

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
index c63223b66534259f4fe2e5ad0922607e518e4c4b..ecf2794137e7eeda5f75a5938d2f0c0674940833 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
@@ -151,15 +151,11 @@ class ConfigurationBuilder {
         this.#removePlugins.push("ImageUpload", "ImageUploadUI", "WoltlabAttachment");
       }
     } else {
-      this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI");
+      this.#removePlugins.push("ImageInsertUI");
 
       if (this.#features.link) {
         this.#removePlugins.push("LinkImage");
       }
-
-      // Disable built-in plugins that rely on the image plugin.
-      this.#removePlugins.push("WoltlabAttachment");
-      this.#removePlugins.push("WoltlabSmiley");
     }
   }
 

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
index 50f9699e2242f5c47a30d0beeb53c16fa0856abd..14716a17094248ddbf68d729ed3577513f93d9a6 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
@@ -139,13 +139,10 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan
                 }
             }
             else {
-                this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI");
+                this.#removePlugins.push("ImageInsertUI");
                 if (this.#features.link) {
                     this.#removePlugins.push("LinkImage");
                 }
-                // Disable built-in plugins that rely on the image plugin.
-                this.#removePlugins.push("WoltlabAttachment");
-                this.#removePlugins.push("WoltlabSmiley");
             }
         }
         #setupBlocks() {