Merge branch 'MAGETWO-60004' into public-pr

VladimirZaets · VladimirZaets · commit 6797c65346ec · 2016-10-24T18:11:07.000+03:00
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -82,6 +82,7 @@ define([
             }
 
             var settings = {
+                entity_encoding: 'raw',
                 mode: (mode != undefined ? mode : 'none'),
                 elements: this.id,
                 theme: 'advanced',

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ define([`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`var settings = {`
	`85`	`+ entity_encoding: 'raw',`
`85`	`86`	`mode: (mode != undefined ? mode : 'none'),`
`86`	`87`	`elements: this.id,`
`87`	`88`	`theme: 'advanced',`