From a657749dbbcc83b9a0528ebe052c13f172379e22 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Tue, 11 Oct 2016 19:13:47 +0300
Subject: [PATCH] MAGETWO-57796: [GitHub] Inserted image in product description
got broken on front end #6138
---
app/code/Magento/Cms/Model/Wysiwyg/Config.php | 1 +
lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 44d512e8f45..a8cd1eb22f6 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -180,6 +180,7 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
'width' => '100%',
'height' => '500px',
'plugins' => [],
+ 'add_directives' => true,
]
);
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index 66b72857d00..22b1de3257f 100755
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -393,7 +393,6 @@ define([
}
content = editor.getContent();
- content = this.decodeContent(content);
jQuery('#' + this.id).val(content).trigger('change');
},
--
GitLab