diff --git a/etemplate/inc/class.etemplate_old.inc.php b/etemplate/inc/class.etemplate_old.inc.php index 02895d58eb..75e4b8f50f 100644 --- a/etemplate/inc/class.etemplate_old.inc.php +++ b/etemplate/inc/class.etemplate_old.inc.php @@ -1339,7 +1339,6 @@ class etemplate_old extends boetemplate } if (!$readonly) { - $mode = $mode ? $mode : 'simple'; $height = $height ? $height : '400px'; $width = $width ? $width : '100%'; $fckoptions = array( diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php index 6810363b30..c5f6c64309 100644 --- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php +++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php @@ -326,7 +326,7 @@ class egw_ckeditor_config * @param boolean $expanded_toolbar specifies whether the ckeditor should start with an expanded toolbar or not * @param string $start_path specifies */ - public static function get_ckeditor_config($mode = 'simple', $height = 400, $expanded_toolbar = true, $start_path = '') + public static function get_ckeditor_config($mode = '', $height = 400, $expanded_toolbar = true, $start_path = '') { return json_encode(self::get_ckeditor_config_array($mode, $height, $expanded_toolbar, $start_path)); } diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index 3b5a06ef29..f3dfe48ca5 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -505,7 +505,7 @@ class html { return self::textarea($name,$content,'style="'.$style.'"'); }*/ - return self::fckEditor($name, $content, ($style ? $style : $GLOBALS['egw_info']['user']['preferences']['common']['rte_features']), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href); + return self::fckEditor($name, $content, $style, array('toolbar_expanded' =>'true'), '400px', '100%', $base_href); } /**