From 93d83f319d4c3ef5cff0fe8e1e596c8ca5868742 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 26 Jun 2012 12:42:52 +0000 Subject: [PATCH] * API: HTML Editor-> disable encoding of html entities in output (this needs to set the ckeditor config value to false, since the default is true with the current ckeditor version) --- phpgwapi/inc/class.egw_ckeditor_config.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php index a1c03271d0..815bf64784 100644 --- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php +++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php @@ -118,7 +118,7 @@ class egw_ckeditor_config break; case 'office2003': $skin = "office2003"; - break; + break; } //Check whether the skin actually exists, if not, switch to a default @@ -148,7 +148,9 @@ class egw_ckeditor_config //Convert the pixel height to an integer value $config['resize_enabled'] = false; $config['height'] = (int)$height; - + //disable encoding as entities needs to set the config value to false, as the default is true with the current ckeditor version + $config['entities'] = false; + $config['entities_latin'] = false; $config['entities'] = true; $config['entities_latin'] = true; $config['editingBlock'] = true; @@ -191,7 +193,7 @@ class egw_ckeditor_config $config['scayt_autoStartup'] = true; $config['scayt_sLang'] = self::get_lang().'_'.self::get_country(); } - + } else { @@ -290,7 +292,7 @@ class egw_ckeditor_config * values are 'simple', 'extended' and 'advanced'. All other values will default to 'simple' * @param integer $height contains the height of the ckeditor in pixels * @param boolean $expanded_toolbar specifies whether the ckeditor should start with an expanded toolbar or not - * @param string $start_path specifies + * @param string $start_path specifies */ public static function get_ckeditor_config($mode = 'simple', $height = 400, $expanded_toolbar = true, $start_path = '') {