Skip to content

Commit

Permalink
TinyMCE is now optional and not installed by default in the core
Browse files Browse the repository at this point in the history
  • Loading branch information
fballiano committed Sep 12, 2024
1 parent 7504425 commit 9864522
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 100 deletions.
5 changes: 5 additions & 0 deletions app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ public function getSkinImagePlaceholderPath()
*/
public function isEnabled()
{
$isTinymceInstalled = \Composer\InstalledVersions::isInstalled('tinymce/tinymce');
if (!$isTinymceInstalled) {
return false;
}

$storeId = $this->getStoreId();
if (!is_null($storeId)) {
$wysiwygState = Mage::getStoreConfig('cms/wysiwyg/enabled', $storeId);
Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
"cweagans/composer-patches": "^1.7",
"ezyang/htmlpurifier": "^4.17",
"mahocommerce/maho-composer-plugin": "dev-main",
"mklkj/tinymce-i18n": "*",
"pelago/emogrifier": "^7.0",
"phpseclib/mcrypt_compat": "^2.0.3",
"phpseclib/phpseclib": "^3.0.14",
"shardj/zf1-future": "1.24.0",
"symfony/console": "^7.1",
"tinymce/tinymce": "6.8.*"
"symfony/console": "^7.1"
},
"replace": {
"symfony/polyfill-ctype": "*",
Expand Down
98 changes: 1 addition & 97 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 comment on commit 9864522

@fballiano
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.