From 523a018f23f82785ba33712a260ec783572bdab4 Mon Sep 17 00:00:00 2001 From: Ludvik Michalek Date: Wed, 23 Aug 2017 14:21:26 +0200 Subject: [PATCH 1/2] fixed wrong context parameter for entity_encoding --- core/components/tinymce/tinymce.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/components/tinymce/tinymce.class.php b/core/components/tinymce/tinymce.class.php index adc89ab..61b362a 100644 --- a/core/components/tinymce/tinymce.class.php +++ b/core/components/tinymce/tinymce.class.php @@ -93,7 +93,7 @@ public function setProperties(array $properties = array()) { 'css_path' => $this->context->getOption('editor_css_path','',$this->properties), 'directionality' => $this->context->getOption('manager_direction','ltr',$this->properties), 'element_format' => $this->context->getOption('tiny.element_format','xhtml',$this->properties), - 'entity_encoding' => $this->context->getOption('tiny.element_format','named',$this->properties), + 'entity_encoding' => $this->context->getOption('tiny.entity_encoding','named',$this->properties), 'fix_nesting' => $this->context->getOption('tiny.fix_nesting',false,$this->properties), 'fix_table_elements' => $this->context->getOption('tiny.fix_table_elements',false,$this->properties), 'font_size_classes' => $this->context->getOption('tiny.font_size_classes','',$this->properties), From fe9d287e97a81bf28e1f0aa2b406e15df31c6799 Mon Sep 17 00:00:00 2001 From: Ludvik Michalek Date: Wed, 23 Aug 2017 14:22:02 +0200 Subject: [PATCH 2/2] added Entities setting to Settings --- _build/data/properties.inc.php | 7 +++++++ _build/data/transport.settings.php | 9 +++++++++ core/components/tinymce/tinymce.class.php | 1 + 3 files changed, 17 insertions(+) diff --git a/_build/data/properties.inc.php b/_build/data/properties.inc.php index 66b41bd..298188f 100644 --- a/_build/data/properties.inc.php +++ b/_build/data/properties.inc.php @@ -104,6 +104,13 @@ ), 'value' => '', ), + array( + 'name' => 'entities', + 'desc' => 'This option contains a comma separated list of entity names that is used instead of characters.', + 'type' => 'textfield', + 'options' => '', + 'value' => '', + ), array( 'name' => 'force_p_newlines', 'desc' => 'This option enables you to disable/enable the creation of paragraphs on return/enter in Mozilla/Firefox. The default value of this option is true. ', diff --git a/_build/data/transport.settings.php b/_build/data/transport.settings.php index 45b7c0d..14090d3 100644 --- a/_build/data/transport.settings.php +++ b/_build/data/transport.settings.php @@ -122,6 +122,15 @@ 'area' => 'cleanup-output', ),'',true,true); +$settings['tiny.entities']= $modx->newObject('modSystemSetting'); +$settings['tiny.entities']->fromArray(array( + 'key' => 'tiny.entities', + 'value' => '', + 'xtype' => 'textfield', + 'namespace' => 'tinymce', + 'area' => 'cleanup-output', +),'',true,true); + $settings['tiny.fix_nesting']= $modx->newObject('modSystemSetting'); $settings['tiny.fix_nesting']->fromArray(array( 'key' => 'tiny.fix_nesting', diff --git a/core/components/tinymce/tinymce.class.php b/core/components/tinymce/tinymce.class.php index 61b362a..8cb5dc7 100644 --- a/core/components/tinymce/tinymce.class.php +++ b/core/components/tinymce/tinymce.class.php @@ -94,6 +94,7 @@ public function setProperties(array $properties = array()) { 'directionality' => $this->context->getOption('manager_direction','ltr',$this->properties), 'element_format' => $this->context->getOption('tiny.element_format','xhtml',$this->properties), 'entity_encoding' => $this->context->getOption('tiny.entity_encoding','named',$this->properties), + 'entities' => $this->context->getOption('tiny.entities','',$this->properties), 'fix_nesting' => $this->context->getOption('tiny.fix_nesting',false,$this->properties), 'fix_table_elements' => $this->context->getOption('tiny.fix_table_elements',false,$this->properties), 'font_size_classes' => $this->context->getOption('tiny.font_size_classes','',$this->properties),