diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php index 194ab470de5..11c70d933a6 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php @@ -14,6 +14,8 @@ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +use Composer\InstalledVersions; + /** * Wysiwyg Config for Editor HTML Element * @@ -25,6 +27,11 @@ */ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object { + /** + * Wysiwyg store config path + */ + public const WYSIWYG_CONFIG_ENABLED = 'cms/wysiwyg/enabled'; + /** * Wysiwyg behaviour: enabled */ @@ -138,11 +145,15 @@ public function getSkinImagePlaceholderPath() */ public function isEnabled() { + if (!InstalledVersions::isInstalled('tinymce/tinymce')) { + return false; + } + $storeId = $this->getStoreId(); if (!is_null($storeId)) { - $wysiwygState = Mage::getStoreConfig('cms/wysiwyg/enabled', $storeId); + $wysiwygState = Mage::getStoreConfig(self::WYSIWYG_CONFIG_ENABLED, $storeId); } else { - $wysiwygState = Mage::getStoreConfig('cms/wysiwyg/enabled'); + $wysiwygState = Mage::getStoreConfig(self::WYSIWYG_CONFIG_ENABLED); } return in_array($wysiwygState, [self::WYSIWYG_ENABLED, self::WYSIWYG_HIDDEN]); } @@ -154,6 +165,6 @@ public function isEnabled() */ public function isHidden() { - return Mage::getStoreConfig('cms/wysiwyg/enabled') == self::WYSIWYG_HIDDEN; + return Mage::getStoreConfig(self::WYSIWYG_CONFIG_ENABLED) == self::WYSIWYG_HIDDEN; } } diff --git a/composer.json b/composer.json index 7a8d4664719..5a8632ae484 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "ext-simplexml": "*", "ext-soap": "*", "ext-zlib": "*", + "composer-runtime-api": "^2", "colinmollenhour/cache-backend-redis": "^1.14", "colinmollenhour/magento-redis-session": "^3.2.0", "cweagans/composer-patches": "^1.7", @@ -48,7 +49,6 @@ }, "require-dev": { "ext-xmlreader": "*", - "composer/composer": "^2.7", "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0", "friendsofphp/php-cs-fixer": "^3.6", "macopedia/phpstan-magento1": "^1.1", diff --git a/composer.lock b/composer.lock index 5df0e1b6762..ef05de59f21 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a2bb45fc20fd05cec1e2e1e3dc9503d7", + "content-hash": "992538810d2699241a4b7525097ee91b", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -7659,7 +7659,8 @@ "ext-pdo_mysql": "*", "ext-simplexml": "*", "ext-soap": "*", - "ext-zlib": "*" + "ext-zlib": "*", + "composer-runtime-api": "^2" }, "platform-dev": { "ext-xmlreader": "*" @@ -7667,5 +7668,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }