From 7b393d6ab97a30e416a387d5a844568c9528f8e6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 11 Apr 2012 14:57:00 +0000 Subject: [PATCH] disable encoding as entities, as it is unnecessary in EGroupware, because we are using utf-8 everywhere --- phpgwapi/inc/class.egw_ckeditor_config.inc.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php index a1c03271d0..6a30ff218e 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 @@ -149,8 +149,6 @@ class egw_ckeditor_config $config['resize_enabled'] = false; $config['height'] = (int)$height; - $config['entities'] = true; - $config['entities_latin'] = true; $config['editingBlock'] = true; $config['disableNativeSpellChecker'] = true; @@ -191,7 +189,7 @@ class egw_ckeditor_config $config['scayt_autoStartup'] = true; $config['scayt_sLang'] = self::get_lang().'_'.self::get_country(); } - + } else { @@ -290,7 +288,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 = '') {