From c68852351fe5d2388dc9a44efe1239dfcdb428ec Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Thu, 20 Apr 2023 11:33:02 +0200
Subject: [PATCH] adjust to OXID eShop

# Conflicts:
#	composer.json
---
 Application/Core/TinyMCE/Loader.php |  3 +++
 composer.json                       | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Application/Core/TinyMCE/Loader.php b/Application/Core/TinyMCE/Loader.php
index c488885..bc37471 100644
--- a/Application/Core/TinyMCE/Loader.php
+++ b/Application/Core/TinyMCE/Loader.php
@@ -83,6 +83,9 @@ class Loader
      */
     protected function contentIsPlain(): bool
     {
+        // D3 disabled, because isPlain method doesn't exist in OXID eShop
+        return false;
+        
         /** @var BaseModel|Content $oEditObject */
         $oEditObject = $this->getShopConfig()->getActiveView()->getViewDataElement("edit");
         return $oEditObject instanceof Content && $oEditObject->isPlain();
diff --git a/composer.json b/composer.json
index c57637a..0493618 100755
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
-  "name": "o3-shop/tinymce-editor",
-  "description": "TinyMCE 6 Integration for O3-Shop",
+  "name": "d3/tinymce-editor",
+  "description": "TinyMCE 6 Integration for OXID-Shop",
   "type": "oxideshop-module",
   "homepage": "https://www.o3-shop.com/",
   "license": [
@@ -14,6 +14,10 @@
     {
       "name": "O3-Shop",
       "email": "info@o3-shop.com"
+    },
+    {
+      "name": "D3 Data Development (Inh. Thomas Dartsch)",
+      "email": "info@d3data.de"
     }
   ],
   "extra": {
@@ -33,7 +37,8 @@
   },
   "require": {
     "php": ">=7.4",
-    "o3-shop/shop-ce": "^1.2 || dev-dev_b-1.2"
+    "oxid-esales/oxideshop-ce": "^6.3.0",
+    "d3/oxidservicebridges": "^1.2"
   },
   "autoload": {
     "psr-4": {