summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2009-02-13 00:51:42 (GMT)
committer sun2009-02-13 00:51:42 (GMT)
commit97d84fa090fa04b02ea68060bfff2dde12371cbf (patch)
treeb5f5fade41c0c4c17b5fe6a6125d5e9ca24e5b38
parent847f281dfdfb0301d58aff479370f36ab158db29 (diff)
#373542 by sun: Fixed TinyMCE: entity_encoding 'raw' removes HTML entities.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/tinymce.inc1
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 954a63f..1c34384 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-1.x, xxxx-xx-xx
---------------------------
+#373542 by sun: Fixed TinyMCE: entity_encoding 'raw' removes HTML entities.
#372806 by sun: Fixed block format configuration form element description.
#367632 by sun: Fixed "Unexpected identifier, string or number" error in IE.
#367632 by sun: Fixed invalid JavaScript syntax.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index ba6fee0..52e537a 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -111,7 +111,6 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
$init = array(
'button_tile_map' => TRUE, // @todo Add a setting for this.
'document_base_url' => base_path(),
- 'entity_encoding' => 'raw',
'mode' => 'none',
'plugins' => array(),
'relative_urls' => FALSE,